mirror of
https://github.com/django-q2/django-q2.git
synced 2026-09-24 00:48:12 +08:00
enhanced admin ormq panel fix and schedules with broker_name
This commit is contained in:
+1
-2
@@ -100,8 +100,7 @@ class QueueAdmin(admin.ModelAdmin):
|
||||
"""Don't allow adds."""
|
||||
return False
|
||||
|
||||
list_filter = ("key", "func")
|
||||
search_fields = ("name", "func")
|
||||
list_filter = ("key",)
|
||||
|
||||
|
||||
admin.site.register(Schedule, ScheduleAdmin)
|
||||
|
||||
+6
-1
@@ -633,7 +633,12 @@ def scheduler(broker: Broker = None):
|
||||
)
|
||||
s.repeats += -1
|
||||
# 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)
|
||||
kwargs["q_options"] = q_options
|
||||
s.task = django_q.tasks.async_task(s.func, *args, **kwargs)
|
||||
|
||||
Reference in New Issue
Block a user