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

adds a limit to the queue

Browse Source
This commit is contained in:
Ilan
2015-07-24 01:04:58 +02:00
parent 805d160bbe
commit d31e9e2b97
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/cluster.py
+2 -2
View File
@@ -132,7 +132,7 @@ class Sentinel(object):
self.pool_size = Conf.WORKERS self.pool_size = Conf.WORKERS
self.pool = [] self.pool = []
self.timeout = timeout self.timeout = timeout
self.task_queue = Queue() self.task_queue = Queue(maxsize=Conf.QUEUE_LIMIT) if Conf.QUEUE_LIMIT else Queue()
self.result_queue = Queue() self.result_queue = Queue()
self.event_out = Event() self.event_out = Event()
self.monitor = Process() self.monitor = Process()
@@ -314,7 +314,7 @@ def pusher(task_queue, event, list_key=Conf.Q_LIST, r=redis_client):
sleep(10) sleep(10)
break break
if task: if task:
task_queue.put(task[1]) task_queue.put(task[1], block=True)
logger.debug(_('queueing from {}').format(list_key)) logger.debug(_('queueing from {}').format(list_key))
if event.is_set(): if event.is_set():
break break
django_q/conf.py
+3
View File
@@ -33,6 +33,9 @@ class Conf(object):
# Failures are always saved # Failures are always saved
SAVE_LIMIT = conf.get('save_limit', 250) SAVE_LIMIT = conf.get('save_limit', 250)
# Maximum number of tasks that each cluster can work on
QUEUE_LIMIT = conf.get('queue_limit', None)
# Number of workers in the pool. Default is cpu count. +2 for monitor and pusher # Number of workers in the pool. Default is cpu count. +2 for monitor and pusher
WORKERS = conf.get('workers', cpu_count()) WORKERS = conf.get('workers', cpu_count())