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

Check optional files findhash result every second

Browse source
This commit is contained in:
HelloZeroNet 2016-05-05 12:11:07 +02:00
parent eedce00d57
commit aa9161a83a
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Worker/WorkerManager.py
View file

@ -251,15 +251,23 @@ class WorkerManager:
for peer in peers: for peer in peers:
threads.append(gevent.spawn(peer.findHashIds, list(optional_hash_ids))) threads.append(gevent.spawn(peer.findHashIds, list(optional_hash_ids)))
gevent.joinall(threads, timeout=5) for i in range(5):
time.sleep(1)
thread_values = [thread.value for thread in threads if thread.value]
if not thread_values:
continue
found_ips = helper.mergeDicts([thread.value for thread in threads if thread.value]) found_ips = helper.mergeDicts(thread_values)
found = self.addOptionalPeers(found_ips) found = self.addOptionalPeers(found_ips)
self.log.debug("Found optional files after findhash connected peers: %s/%s" % (len(found), len(optional_hash_ids))) self.log.debug("Found optional files after findhash connected peers: %s/%s" % (len(found), len(optional_hash_ids)))
if found: if found:
found_peers = set([peer for hash_id_peers in found.values() for peer in hash_id_peers]) found_peers = set([peer for hash_id_peers in found.values() for peer in hash_id_peers])
self.startWorkers(found_peers) self.startWorkers(found_peers)
if len(thread_values) == len(threads):
# Got result from all started thread
break
if len(found) < len(optional_hash_ids): if len(found) < len(optional_hash_ids):
self.log.debug("No findHash result, try random peers: %s" % (optional_hash_ids - set(found))) self.log.debug("No findHash result, try random peers: %s" % (optional_hash_ids - set(found)))