From 8eb14314133462fd576b9df92192ff3e80cca58f Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Tue, 8 Sep 2015 15:50:32 +0200 Subject: [PATCH] Resets broker configuration in case a third party broker crashes --- django_q/brokers/__init__.py | 4 ++-- django_q/brokers/{ironmq_broker.py => ironmq.py} | 0 django_q/tests/test_cluster.py | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) rename django_q/brokers/{ironmq_broker.py => ironmq.py} (100%) diff --git a/django_q/brokers/__init__.py b/django_q/brokers/__init__.py index c1c3d08..626717c 100644 --- a/django_q/brokers/__init__.py +++ b/django_q/brokers/__init__.py @@ -155,8 +155,8 @@ def get_broker(list_key=Conf.PREFIX): from brokers import disque return disque.Disque(list_key=list_key) elif Conf.IRON_MQ: - from brokers import ironmq_broker - return ironmq_broker.IronMQBroker(list_key=list_key) + from brokers import ironmq + return ironmq.IronMQBroker(list_key=list_key) # default to redis else: from brokers import redis_broker diff --git a/django_q/brokers/ironmq_broker.py b/django_q/brokers/ironmq.py similarity index 100% rename from django_q/brokers/ironmq_broker.py rename to django_q/brokers/ironmq.py diff --git a/django_q/tests/test_cluster.py b/django_q/tests/test_cluster.py index e2ecd94..3aa09c6 100644 --- a/django_q/tests/test_cluster.py +++ b/django_q/tests/test_cluster.py @@ -18,11 +18,6 @@ from django_q.status import Stat from django_q.brokers import get_broker from .tasks import multiply -Conf.DISQUE_NODES = None -Conf.IRON_MQ = None -Conf.DJANGO_REDIS = 'default' - - class WordClass(object): def __init__(self): self.word_list = DEFAULT_WORDLIST @@ -33,6 +28,9 @@ class WordClass(object): @pytest.fixture def broker(): + Conf.DISQUE_NODES = None + Conf.IRON_MQ = None + Conf.DJANGO_REDIS = 'default' return get_broker()