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

enhanced admin ormq panel fix and schedules with broker_name

Browse Source
This commit is contained in:
Telmo Barros
2021-02-06 18:52:17 +00:00
parent 10df8351ff
commit 1d6d996fd0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/admin.py
+1 -2
View File
@@ -100,8 +100,7 @@ class QueueAdmin(admin.ModelAdmin):
"""Don't allow adds.""" """Don't allow adds."""
return False return False
list_filter = ("key", "func") list_filter = ("key",)
search_fields = ("name", "func")
admin.site.register(Schedule, ScheduleAdmin) admin.site.register(Schedule, ScheduleAdmin)
django_q/cluster.py
+6 -1
View File
@@ -633,7 +633,12 @@ def scheduler(broker: Broker = None):
) )
s.repeats += -1 s.repeats += -1
# send it to the cluster # send it to the cluster
q_options["broker"] = broker scheduled_broker = broker
try:
scheduled_broker = get_broker(q_options["broker_name"])
except: # invalid broker_name or non existing broker with broker_name
pass
q_options["broker"] = scheduled_broker
q_options["group"] = q_options.get("group", s.name or s.id) q_options["group"] = q_options.get("group", s.name or s.id)
kwargs["q_options"] = q_options kwargs["q_options"] = q_options
s.task = django_q.tasks.async_task(s.func, *args, **kwargs) s.task = django_q.tasks.async_task(s.func, *args, **kwargs)