Remove the originated time from the DHT value storage.

[quix0rs-apt-p2p.git] / apt-dht.py

diff --git a/apt-dht.py b/apt-dht.py
index e5288b0a77b7be3731b101dbe572e5f14e1beb63..1d9933b47d39b280dbd205e347c0479d06fb8add 100644 (file)
--- a/apt-dht.py
+++ b/apt-dht.py
@@ -16,10 +16,10 @@ from twisted.internet import reactor
 from twisted.python import usage, log
 from twisted.web2 import channel
 
-from apt_dht.apt_dht_conf import config, version
+from apt_dht.apt_dht_conf import config, version, DEFAULT_CONFIG_FILES
 from apt_dht.interfaces import IDHT
 
-config_file = []
+config_file = ''
 
 if __name__ == '__main__':
     # Parse command line parameters when started on command line
@@ -28,7 +28,7 @@ if __name__ == '__main__':
             ['help', 'h', 'Print this help message'],
             ]
         optParameters = [
-            ['config-file', 'c', [], "Configuration file"],
+            ['config-file', 'c', '', "Configuration file"],
             ['log-file', 'l', '-', "File to log to, - for stdout"],
             ]
         longdesc="apt-dht is a peer-to-peer downloader for apt users"
@@ -51,7 +51,9 @@ if __name__ == '__main__':
         f = open(log_file, 'w')
     log.startLogging(f, setStdout=1)
 
-config.read(config_file)
+log.msg("Loading config files: '%s'" % "', '".join(DEFAULT_CONFIG_FILES + [config_file]))
+config_read = config.read(DEFAULT_CONFIG_FILES + [config_file])
+log.msg("Successfully loaded config files: '%s'" % "', '".join(config_read))
 if config.has_option('DEFAULT', 'username') and config.get('DEFAULT', 'username'):
     uid,gid = pwd.getpwnam(config.get('DEFAULT', 'username'))[2:4]
 else:
@@ -71,8 +73,8 @@ if not config.getboolean('DEFAULT', 'DHT-only'):
     log.msg('Starting main application server')
     from apt_dht.apt_dht import AptDHT
     myapp = AptDHT(myDHT)
-    site = myapp.getSite()
-    s = strports.service('tcp:'+config.get('DEFAULT', 'port'), channel.HTTPFactory(site))
+    factory = myapp.getHTTPFactory()
+    s = strports.service('tcp:'+config.get('DEFAULT', 'port'), factory)
     s.setServiceParent(application)
 else:
     myDHT.loadConfig(config, config.get('DEFAULT', 'DHT'))