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

version bump, allow to publihs to specified peer, log sendCmd, add zeronet version to content.js, version to websocket api, force start worker specificed for specificed peer

Browse source
This commit is contained in:
HelloZeroNet 2015-01-16 11:52:42 +01:00
parent aae1022c79
commit 185424b815
9 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Worker/Worker.py
View file

@ -20,6 +20,7 @@ class Worker:
if not task: # Die, no more task
self.manager.log.debug("%s: No task found, stopping" % self.key)
break
if not task["time_started"]: task["time_started"] = time.time() # Task started now
if task["workers_num"] > 0: # Wait a bit if someone already working on it
self.manager.log.debug("%s: Someone already working on %s, sleeping 1 sec..." % (self.key, task["inner_path"]))
@ -27,7 +28,6 @@ class Worker:
self.manager.log.debug("%s: %s, task done after sleep: %s" % (self.key, task["inner_path"], task["done"]))
if task["done"] == False:
if not task["time_started"]: task["time_started"] = time.time() # Task started now
self.task = task
task["workers_num"] += 1
buff = self.peer.getFile(task["site"].address, task["inner_path"])

2
src/Worker/WorkerManager.py
View file

@ -77,7 +77,7 @@ class WorkerManager:
# Start workers to process tasks
def startWorkers(self, peers=None):
if len(self.workers) >= MAX_WORKERS: return False # Workers number already maxed
if len(self.workers) >= MAX_WORKERS and not peers: return False # Workers number already maxed
if not self.tasks: return False # No task for workers
for key, peer in self.site.peers.iteritems(): # One worker for every peer
if peers and peer not in peers: continue # If peers definied and peer not valid