--- a/bin/pvl.syslog-dhcp	Fri Jan 25 22:02:55 2013 +0200
+++ b/bin/pvl.syslog-dhcp	Sat Jan 26 11:09:30 2013 +0200
@@ -10,8 +10,8 @@
 import pvl.syslog.args
 
 import pvl.verkko.db as db
-import pvl.syslog.dhcp
-import pvl.verkko.dhcp.leases
+import pvl.dhcp.syslog
+import pvl.dhcp.leases
 
 import logging, optparse
 
@@ -294,7 +294,7 @@
         self.leasedb = DHCPLeasesDatabase(db)
 
         # XXX
-        self.filter = pvl.syslog.dhcp.DHCPSyslogFilter()
+        self.parser = pvl.dhcp.syslog.DHCPSyslogParser()
 
     def createdb (self) :
         """
@@ -309,7 +309,7 @@
             Handle a single item read from syslog to DB.
         """
 
-        dhcp_item = self.filter.parse(item['msg'])
+        dhcp_item = self.parser.parse(item['msg'])
 
         log.debug("%s: %s", item, dhcp_item)
         
@@ -360,15 +360,10 @@
             
             if self.leases :
                 # process internally
-                #sync, leases = self.leases.process()
                 leases = self.leases.process()
 
-                #if sync :
-                #    self.sync_leases(leases)
                 if leases :
                     self.process_leases(leases)
-                #else :
-                #    pass
 
             if not poll :
                 # done
@@ -408,7 +403,7 @@
     # leases
     if options.leases_file :
         log.info("Open up DHCP leases...")
-        leases = pvl.verkko.dhcp.leases.DHCPLeasesDatabase(options.leases_file)
+        leases = pvl.dhcp.leases.DHCPLeasesDatabase(options.leases_file)
 
         # force polling interval
         if options.leases_tail :