diff --git a/server/yadyn b/server/yadyn index b8437a0..c8d099a 100755 --- a/server/yadyn +++ b/server/yadyn @@ -3,6 +3,8 @@ import Queue import time import shelve +import os +import sys from logger import Logger import DynHandler @@ -16,13 +18,15 @@ import Event MSG_TIME_CORRIDOR = 120 -EVENT_LIFE_TIME = 10 +EVENT_LIFE_TIME = 300 NULL_ADDRESS = '0.0.0.0' TTL = 120 -EXPIRY_PERIOD = 10 +EXPIRY_PERIOD = 300 NAMESERVER = '88.198.170.2' TSIGKEY = { "monitoring." : "+xLH8GuZnEgBljuIEM/iDA==" } -PIDFILE = "/tmp/yadyn.pid" +PID_FILE = "/var/db/yadyn/yadyn.pid" +ENTRIES_FILE = "/var/db/yadyn/entries" +STATUSMAP_FILE = "/var/db/yadyn/statusMap" ADMIN_PWD = 'test123' DEBUG = False @@ -34,7 +38,7 @@ else: pid = os.fork() if pid: - pidFile = file(PIDFILE , mode='w') + pidFile = file(PID_FILE , mode='w') pidFile.write("%i\n" % pid) pidFile.close() sys.exit(0) @@ -45,10 +49,8 @@ Logger.openlog() if DEBUG: Logger.debugEnable() -entries = shelve.open('entries', flag='c', writeback=True) -if len(entries) == 0: - entries['testhost'] = Entry.Entry('testhost', 'test123', 'test', 'test.de') -statusMap = shelve.open('statusMap', flag='c', writeback=True) +entries = shelve.open(ENTRIES_FILE, flag='c', writeback=True) +statusMap = shelve.open(STATUSMAP_FILE, flag='c', writeback=True)