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

Merge pull request #33 from Koed00/dev

Browse Source 
Group filter and queue limit indicator
This commit is contained in:
Ilan Steemers
2015-07-24 11:55:03 -07:00
parent 266a0dbcb1 ac41d50bf2
commit d72d90b1f0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django_q/admin.py
View File

@@ -26,6 +26,7 @@ class TaskAdmin(admin.ModelAdmin):
search_fields = ('name', 'func', 'group')
readonly_fields = []
list_filter = ('group',)
def get_readonly_fields(self, request, obj=None):
return list(self.readonly_fields) + \
@@ -56,6 +57,7 @@ class FailAdmin(admin.ModelAdmin):
actions = [retry_failed]
search_fields = ('name', 'func')
list_filter = ('group',)
readonly_fields = []
def get_readonly_fields(self, request, obj=None):

8
django_q/monitor.py
View File

@@ -53,9 +53,11 @@ def monitor(run_once=False):
elif stat.status == Conf.IDLE:
status = str(Conf.IDLE)
# color q's
tasks = stat.task_q_size
if tasks > 0:
tasks = term.cyan(str(tasks))
tasks = str(stat.task_q_size)
if stat.task_q_size > 0:
tasks = term.cyan(str(stat.task_q_size))
if Conf.QUEUE_LIMIT and stat.task_q_size == Conf.QUEUE_LIMIT:
tasks = term.green(str(stat.task_q_size))
results = stat.done_q_size
if results > 0:
results = term.cyan(str(results))