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

Stabilize the stop procedure after forced termination of the monitor causes an unstable queue.

Browse Source 
* added timeout to final stop
* ony terminate on timeouts
* renamed done_queue to result_queue
This commit is contained in:
Ilan Steemers
2015-07-07 15:48:13 +02:00
parent 5c05c8ff76
commit 38dc20043c
2 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/monitor.py
+4 -4
View File
@@ -9,8 +9,8 @@ from django.utils import timezone
from django.utils.translation import ugettext as _
# local
from .conf import Conf, redis_client, logger
from .tasks import SignedPackage
from django_q.conf import Conf, redis_client, logger
from django_q.tasks import SignedPackage
def monitor(run_once=False):
@@ -113,13 +113,13 @@ class Stat(Status):
"""
def __init__(self, sentinel):
super(Stat, self).__init__(sentinel.parent_pid)
super(Stat, self).__init__(sentinel.parent_pid or sentinel.pid)
self.r = sentinel.r
self.tob = sentinel.tob
self.reincarnations = sentinel.reincarnations
self.sentinel = sentinel.pid
self.status = sentinel.status()
self.done_q_size = sentinel.done_queue.qsize()
self.done_q_size = sentinel.result_queue.qsize()
if sentinel.monitor:
self.monitor = sentinel.monitor.pid
self.task_q_size = sentinel.task_queue.qsize()