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

Formatting

Browse source
This commit is contained in:
shortcutme 2018-02-12 17:06:36 +01:00
parent 5f851c7880
commit a548426c39
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Worker/WorkerManager.py
View file

@ -1,6 +1,5 @@
import time
import logging
import random
import collections
import gevent
@ -174,7 +173,10 @@ class WorkerManager(object):
return False # No task for workers
if len(self.workers) >= self.getMaxWorkers() and not peers:
return False # Workers number already maxed and no starting peers defined
self.log.debug("Starting workers, tasks: %s, peers: %s, workers: %s" % (len(self.tasks), len(peers or []), len(self.workers)))
self.log.debug(
"Starting workers, tasks: %s, peers: %s, workers: %s" %
(len(self.tasks), len(peers or []), len(self.workers))
)
if not peers:
peers = self.site.getConnectedPeers()
if len(peers) < self.getMaxWorkers():
@ -183,7 +185,7 @@ class WorkerManager(object):
peers = list(peers)
# Sort by ping
peers.sort(key = lambda peer: peer.connection.last_ping_delay if peer.connection and len(peer.connection.waiting_requests) == 0 and peer.connection.connected else 9999)
peers.sort(key=lambda peer: peer.connection.last_ping_delay if peer.connection and len(peer.connection.waiting_requests) == 0 and peer.connection.connected else 9999)
for peer in peers: # One worker for every peer
if peers and peer not in peers:
@ -309,7 +311,10 @@ class WorkerManager(object):
self.startWorkers(found_peers, force_num=3)
if len(found) < len(optional_hash_ids) or find_more:
self.log.debug("No connected hashtable result for optional files: %s" % (optional_hash_ids - set(found)))
self.log.debug(
"No connected hashtable result for optional files: %s (asked: %s)" %
(optional_hash_ids - set(found), len(self.asked_peers))
)
if not self.tasks:
self.log.debug("No tasks, stopping finding optional peers")
return
@ -346,7 +351,10 @@ class WorkerManager(object):
break
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 (asked: %s)" %
(optional_hash_ids - set(found), len(self.asked_peers))
)
# Try to query random peers
if time_tasks != self.time_task_added: # New task added since start
@ -523,7 +531,10 @@ class WorkerManager(object):
task["done"] = True
self.tasks.remove(task) # Remove from queue
if task["optional_hash_id"]:
self.log.debug("Downloaded optional file in %.3fs, adding to hashfield: %s" % (time.time() - task["time_started"], task["inner_path"]))
self.log.debug(
"Downloaded optional file in %.3fs, adding to hashfield: %s" %
(time.time() - task["time_started"], task["inner_path"])
)
self.site.content_manager.optionalDownloaded(task["inner_path"], task["optional_hash_id"], task["size"])
self.site.onFileDone(task["inner_path"])
task["evt"].set(True)