--- a/bin/pvl.dhcp-leases	Sat Jan 26 11:51:36 2013 +0200
+++ b/bin/pvl.dhcp-leases	Sat Jan 26 11:57:52 2013 +0200
@@ -65,6 +65,22 @@
 
     return options, args
 
+import time 
+
+def mainloop (leases, db, poll) :
+    while True :
+        log.debug("tick")
+
+        for lease in leases :
+            db(lease)
+        
+        log.debug("tock")
+
+        if poll :
+            time.sleep(poll)
+        else :
+            return 0
+
 def main (argv) :
     options, args = parse_options(argv)
 
@@ -92,21 +108,7 @@
 
     # mainloop
     log.info("Enter mainloop...")
-    while True :
-        log.debug("tick")
-
-        for lease in leases :
-            leases_db(lease)
-        
-        log.debug("tock")
-
-        if poll :
-            time.sleep(poll)
-        else :
-            break
-    
-    # done
-    return 0
+    return mainloop(leases, leases_db, poll)
 
 if __name__ == '__main__':
     import sys