From 1d6d996fd0e461507458a797cd8f1f2055b2b80a Mon Sep 17 00:00:00 2001 From: Telmo Barros Date: Sat, 6 Feb 2021 18:52:17 +0000 Subject: [PATCH] enhanced admin ormq panel fix and schedules with broker_name --- django_q/admin.py | 3 +-- django_q/cluster.py | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/django_q/admin.py b/django_q/admin.py index 66c4d01..b4a12f3 100644 --- a/django_q/admin.py +++ b/django_q/admin.py @@ -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) diff --git a/django_q/cluster.py b/django_q/cluster.py index 5fc437e..d5532fa 100644 --- a/django_q/cluster.py +++ b/django_q/cluster.py @@ -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)