some fixes

server/DynHandler.py

@@ -16,5 +16,5 @@ class DynHandler(threading.Thread):
                 event.prepare()
                 Logger.debug("Processing event %s" % str(event))
                 event.process()
-            except Event.IllegalEventException, e:
+            except Event.EventException, e:
                 Logger.log("Some failure: %s when processing event %s" % (e.msg, str(event)))

server/Event.py

@@ -2,7 +2,15 @@ import md5
 import Queue
 from logger import Logger
 
-class IllegalEventException(Exception):
+class EventException(Exception): 
+    def __init__(self, msg):
+        self.msg = msg
+
+class IllegalEventException(EventException):
+    def __init__(self, msg):
+        self.msg = msg
+
+class IllegalStateException(EventException):
     def __init__(self, msg):
         self.msg = msg
 
@@ -18,6 +26,7 @@ class Event(object):
         self.address = address
         self.data = data
         self.receiveTime = receiveTime
+	self.prepared = False
 
     def prepare(self):
         self.port = self.address[1]
@@ -34,7 +43,7 @@ class Event(object):
 
     def process(self):
         if not self.prepared:
-            self.prepare()
+            raise IllegalStateException("try to process a non-prepared event")
 
         if not Event.entries.has_key(self.dynid):
             raise IllegalEventException("unknown dynid in event %s" % str(self))
@@ -64,6 +73,4 @@ class Event(object):
             Logger.log("Dns Queue overrun, drop event for %s" % str(entry))
 
     def __str__(self):
-        if not self.prepared:
-            self.prepare()
         return "%s from %s:%d" % (self.data, self.address, self.port)

server/yadyn

@@ -41,7 +41,7 @@ EVENT_LIFE_TIME = 600
 NULL_ADDRESS = '0.0.0.0'
 TTL = 120
 EXPIRY_PERIOD = 300
-NAMESERVER = '88.198.170.2'
+NAMESERVER = '46.4.171.193'
 NAMESERVER_PORT = 53
 TSIGKEY = { "yadyn." : "+xLH8GuZnEgBljuIEM/iDA==" }
 PID_FILE = "/var/db/yadyn/yadyn.pid"
@@ -50,7 +50,7 @@ CUSTOMERS_FILE = "/var/db/yadyn/customers"
 ACTIONLOG_DIR = "/var/db/yadyn/actionlog"
 ADMIN_PWD = 'test123'
 DNS_DUMMY = False
-DEBUG = True
+DEBUG = False
 BACKGROUND = True
 
 
@@ -109,9 +109,9 @@ try:
     dynReceiver.start()
     Logger.debug("DynReceiver started")
 
-    expirer = Expirer.Expirer(entries, EVENT_LIFE_TIME, NULL_ADDRESS, EXPIRY_PERIOD, dnsq)
+#    expirer = Expirer.Expirer(entries, EVENT_LIFE_TIME, NULL_ADDRESS, EXPIRY_PERIOD, dnsq)
-    expirer.start()
+#    expirer.start()
-    Logger.debug("Expirer started")
+#    Logger.debug("Expirer started")
 
     cmdReceiver = CmdReceiver.CmdReceiver(("", 8023), entries, customers)
     cmdReceiver.start()