changes

server/Expirer.py

@@ -3,11 +3,12 @@ import time
 from logger import Logger
 
 class Expirer(threading.Thread):
-    def __init__(self, entries, eventLifeTime, nullAddress, dnsq):
+    def __init__(self, entries, eventLifeTime, nullAddress, expiryPeriod, dnsq):
         threading.Thread.__init__(self)
         self.entries = entries
         self.eventLifeTime = eventLifeTime
         self.nullAddress = nullAddress
+        self.expiryPeriod = expiryPeriod
         self.dnsq = dnsq
         self.setDaemon(True)
 
@@ -26,5 +27,5 @@ class Expirer(threading.Thread):
                         self.dnsq.put_nowait(entry)
                     except Queue.Full, e:
                         Logger.log("Dns Queue overrun, drop expiry of %s" % str(entry))
-            time.sleep(10)
+            time.sleep(self.expiryPeriod)
 

server/yadyn

@@ -15,18 +15,35 @@ import Event
 
 
 
-MSG_TIME_CORRIDOR = 5
+MSG_TIME_CORRIDOR = 120
 EVENT_LIFE_TIME = 10
 NULL_ADDRESS = '0.0.0.0'
 TTL = 120
+EXPIRY_PERIOD = 10
 NAMESERVER = '88.198.170.2'
 TSIGKEY = { "monitoring." : "+xLH8GuZnEgBljuIEM/iDA==" }
 PIDFILE = "/tmp/yadyn.pid"
 ADMIN_PWD = 'test123'
+DEBUG = False
+
+
+
+if DEBUG:
+    pid = 0
+else:
+    pid = os.fork()
+
+if pid:
+    pidFile = file(PIDFILE , mode='w')
+    pidFile.write("%i\n" % pid)
+    pidFile.close()
+    sys.exit(0)
+
 
 
 Logger.openlog()
-Logger.debugEnable()
+if DEBUG:
+    Logger.debugEnable()
 
 entries = shelve.open('entries', flag='c', writeback=True)
 if len(entries) == 0:
@@ -34,6 +51,8 @@ if len(entries) == 0:
 statusMap = shelve.open('statusMap', flag='c', writeback=True)
 
 
+
+
 try:
     eventq = Queue.Queue()
     dnsq = Queue.Queue()
@@ -49,7 +68,7 @@ try:
     dynReceiver = DynReceiver.DynReceiver(("", 8053), eventq)
     dynReceiver.start()
 
-    expirer = Expirer.Expirer(entries, EVENT_LIFE_TIME, NULL_ADDRESS, dnsq)
+    expirer = Expirer.Expirer(entries, EVENT_LIFE_TIME, NULL_ADDRESS, EXPIRY_PERIOD, dnsq)
     expirer.start()
 
     cmdReceiver = CmdReceiver.CmdReceiver(("", 8023), entries, ADMIN_PWD)