Scanning cache directories on startup waits for DHT storeValue to return.

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

diff --git a/apt-dht.py b/apt-dht.py
index 3cc5d94f0ef502fc8fc416e44d4b24a918ff8feb..70a12640b7c7f5481bd86cdb327c80587a1d9853 100644 (file)
--- a/apt-dht.py
+++ b/apt-dht.py
@@ -59,8 +59,6 @@ log.msg('Starting DHT')
 DHT = __import__(config.get('DEFAULT', 'DHT')+'.DHT', globals(), locals(), ['DHT'])
 assert IDHT.implementedBy(DHT.DHT), "You must provide a DHT implementation that implements the IDHT interface."
 myDHT = DHT.DHT()
-myDHT.loadConfig(config, config.get('DEFAULT', 'DHT'))
-myDHT.join()
 
 if not config.getboolean('DEFAULT', 'DHT-only'):
     log.msg('Starting main application server')
@@ -69,6 +67,9 @@ if not config.getboolean('DEFAULT', 'DHT-only'):
     site = myapp.getSite()
     s = strports.service('tcp:'+config.get('DEFAULT', 'port'), channel.HTTPFactory(site))
     s.setServiceParent(application)
+else:
+    myDHT.loadConfig(config, config.get('DEFAULT', 'DHT'))
+    myDHT.join()
 
 if __name__ == '__main__':
     # Run on command line