fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-08 07:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix reincarnation bug without timeout set

Browse Source
This commit is contained in:
Ilan Steemers
2015-07-07 16:45:05 +02:00
parent 38dc20043c
commit 33b7fe50ed
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/cluster.py
+2 -2
View File
@@ -193,7 +193,7 @@ class Sentinel(object):
else: else:
self.pool.remove(process) self.pool.remove(process)
self.spawn_worker() self.spawn_worker()
if int(process.timer.value) >= self.timeout: if self.timeout and int(process.timer.value) >= self.timeout:
# only need to terminate on timeout, otherwise we risk destabilizing the queues # only need to terminate on timeout, otherwise we risk destabilizing the queues
process.terminate() process.terminate()
logger.warn(_("reincarnated worker {} after timeout").format(process.name)) logger.warn(_("reincarnated worker {} after timeout").format(process.name))
@@ -205,6 +205,7 @@ class Sentinel(object):
self.reincarnations += 1 self.reincarnations += 1
def spawn_cluster(self): def spawn_cluster(self):
self.pool = []
Stat(self).save() Stat(self).save()
for i in range(self.pool_size): for i in range(self.pool_size):
self.spawn_worker() self.spawn_worker()
@@ -282,7 +283,6 @@ class Sentinel(object):
count += 1 count += 1
# Final status # Final status
Stat(self).save() Stat(self).save()
self.pool = []
def pusher(task_queue, e, list_key=Conf.Q_LIST, r=redis_client): def pusher(task_queue, e, list_key=Conf.Q_LIST, r=redis_client):