diff --git a/server/yadyn b/server/yadyn index f5caff6..e04e6b5 100755 --- a/server/yadyn +++ b/server/yadyn @@ -13,23 +13,24 @@ import Expirer import DynReceiver import CmdReceiver import XmlRpcReceiver +import HttpCmdReceiver import Entry import Event MSG_TIME_CORRIDOR = 120 -EVENT_LIFE_TIME = 5 +EVENT_LIFE_TIME = 300 NULL_ADDRESS = '0.0.0.0' TTL = 120 -EXPIRY_PERIOD = 10 +EXPIRY_PERIOD = 300 NAMESERVER = '88.198.170.2' TSIGKEY = { "yadyn." : "+xLH8GuZnEgBljuIEM/iDA==" } PID_FILE = "/var/db/yadyn/yadyn.pid" ENTRIES_FILE = "/var/db/yadyn/entries" ACTIONLOG_DIR = "/var/db/yadyn/actionlog" ADMIN_PWD = 'test123' -DNS_DUMMY = True +DNS_DUMMY = False DEBUG = False @@ -83,9 +84,13 @@ try: cmdReceiver.start() Logger.debug("CmdReceiver started") - xmlRpcReceiver = XmlRpcReceiver.XmlRpcReceiver(("", 8024), entries, ADMIN_PWD) - xmlRpcReceiver.start() - Logger.debug("XmlRpcReceiver started") + # xmlRpcReceiver = XmlRpcReceiver.XmlRpcReceiver(("", 8024), entries, ADMIN_PWD) + # xmlRpcReceiver.start() + # Logger.debug("XmlRpcReceiver started") + + httpCmdReceiver = HttpCmdReceiver.HttpCmdReceiver(("", 8025), entries, ADMIN_PWD) + httpCmdReceiver.start() + Logger.debug("httpCmdReceiver started")