HelloZeroNet
/
ZeroNet
mirror of https://github.com/HelloZeroNet/ZeroNet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Always try to find new peers for optional files if no workers

This commit is contained in:
shortcutme 2017-04-01 22:29:49 +02:00
parent 16f7a6d3cb
commit cfb2276ecd
No known key found for this signature in database
GPG Key ID: 5B63BAE6CB9613AE
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Worker/WorkerManager.py
View File

@ -77,18 +77,22 @@ class WorkerManager(object):
)
task["site"].announce(mode="more") # Find more peers
if task["optional_hash_id"]:
if not task["time_started"]:
ask_limit = 20
elif task["priority"] > 0:
ask_limit = max(10, time.time() - task["time_started"])
else:
ask_limit = max(10, (time.time() - task["time_started"]) / 2)
if len(self.asked_peers) < ask_limit and len(task["peers"] or []) <= len(task["failed"]) * 2:
# Re-search for high priority
self.startFindOptional(find_more=True)
if self.workers:
if not task["time_started"]:
ask_limit = 20
elif task["priority"] > 0:
ask_limit = max(10, time.time() - task["time_started"])
else:
ask_limit = max(10, (time.time() - task["time_started"]) / 2)
if len(self.asked_peers) < ask_limit and len(task["peers"] or []) <= len(task["failed"]) * 2:
# Re-search for high priority
self.startFindOptional(find_more=True)
elif task["peers"]:
if not self.workers:
self.startWorkers([peer for peer in task["peers"] if peer not in task["failed"]])
peers_try = [peer for peer in task["peers"] if peer not in task["failed"]]
if peers_try:
self.startWorkers(peers_try)
else:
self.startFindOptional(find_more=True)
else:
if task["peers"]: # Release the peer lock
self.log.debug("Task peer lock release: %s" % task["inner_path"])