diff --git a/src/Config.py b/src/Config.py index 7e4f131e..019cd9c8 100644 --- a/src/Config.py +++ b/src/Config.py @@ -8,7 +8,7 @@ class Config(object): def __init__(self, argv): self.version = "0.4.0" - self.rev = 1411 + self.rev = 1413 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/Worker/WorkerManager.py b/src/Worker/WorkerManager.py index 106ee684..f22a5079 100644 --- a/src/Worker/WorkerManager.py +++ b/src/Worker/WorkerManager.py @@ -6,6 +6,7 @@ import collections import gevent from Worker import Worker +from Config import config from util import helper import util @@ -46,8 +47,8 @@ class WorkerManager: tasks = self.tasks[:] # Copy it so removing elements wont cause any problem for task in tasks: size_extra_time = task["size"] / (1024 * 100) # 1 second for every 100k - if task["time_started"] and time.time() >= task["time_started"] + 60 + size_extra_time: # Task taking too long time, skip it - self.log.debug("Timeout, Skipping: %s" % task) + if task["time_started"] and time.time() >= task["time_started"] + 60 + size_extra_time: + self.log.debug("Timeout, Skipping: %s" % task) # Task taking too long time, skip it # Skip to next file workers workers = self.findWorkers(task) if workers: @@ -81,7 +82,9 @@ class WorkerManager: # Returns the next free or less worked task def getTask(self, peer): - self.tasks.sort(key=lambda task: task["priority"] - task["workers_num"] * 5, reverse=True) # Sort tasks by priority and worker numbers + # Sort tasks by priority and worker numbers + self.tasks.sort(key=lambda task: task["priority"] - task["workers_num"] * 5, reverse=True) + for task in self.tasks: # Find a task if task["peers"] and peer not in task["peers"]: continue # This peer not allowed to pick this task @@ -233,7 +236,9 @@ class WorkerManager: gevent.joinall(threads, timeout=5) found = self.findOptionalTasks(optional_tasks) - self.log.debug("Found optional files after query hashtable connected peers: %s/%s" % (len(found), len(optional_hash_ids))) + self.log.debug("Found optional files after query hashtable connected peers: %s/%s" % ( + len(found), len(optional_hash_ids) + )) if found: found_peers = set([peer for hash_id_peers in found.values() for peer in hash_id_peers]) @@ -259,7 +264,9 @@ class WorkerManager: found_ips = helper.mergeDicts(thread_values) 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: found_peers = set([peer for hash_id_peers in found.values() for peer in hash_id_peers]) @@ -368,8 +375,9 @@ class WorkerManager: size = 0 priority += self.getPriorityBoost(inner_path) task = { - "evt": evt, "workers_num": 0, "site": self.site, "inner_path": inner_path, "done": False, "optional_hash_id": optional_hash_id, - "time_added": time.time(), "time_started": None, "time_action": None, "peers": peers, "priority": priority, "failed": [], "size": size + "evt": evt, "workers_num": 0, "site": self.site, "inner_path": inner_path, "done": False, + "optional_hash_id": optional_hash_id, "time_added": time.time(), "time_started": None, + "time_action": None, "peers": peers, "priority": priority, "failed": [], "size": size } self.tasks.append(task)