oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow 100 sec timeout for listModification

Browse source
This commit is contained in:
shortcutme 2017-02-27 00:09:41 +01:00
parent 09ad4133fb
commit adbaadae81
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Site/Site.py
View file

@ -337,17 +337,22 @@ class Site(object):
if since is None: # No since defined, download from last modification time-1day if since is None: # No since defined, download from last modification time-1day
since = self.settings.get("modified", 60 * 60 * 24) - 60 * 60 * 24 since = self.settings.get("modified", 60 * 60 * 24) - 60 * 60 * 24
self.log.debug("Try to get listModifications from peers: %s since: %s" % (peers_try, since)) self.log.debug("Try to get listModifications from peers: %s, connected: %s, since: %s" % (peers_try, peers_connected_num, since))
updaters = [] updaters = []
for i in range(3): for i in range(3):
updaters.append(gevent.spawn(self.updater, peers_try, queried, since)) updaters.append(gevent.spawn(self.updater, peers_try, queried, since))
gevent.joinall(updaters, timeout=10) # Wait 10 sec to workers done query modifications gevent.joinall(updaters, timeout=10) # Wait 10 sec to workers done query modifications
if not queried:
gevent.joinall(updaters, timeout=10) # Wait another 10 sec if none of updaters finished
self.log.debug("Queried listModifications from: %s in %s" % (queried, time.time() - s)) if not queried: # Start another 3 thread if first 3 is stuck
peers_try[0:0] = [peer for peer in self.getConnectedPeers() if peer.connection.connected] # Add really connected peers
for _ in range(10):
gevent.joinall(updaters, timeout=10) # Wait another 10 sec if none of updaters finished
if queried:
break
self.log.debug("Queried listModifications from: %s in %.3fs" % (queried, time.time() - s))
time.sleep(0.1) time.sleep(0.1)
return queried return queried