diff --git a/django_q/brokers/orm.py b/django_q/brokers/orm.py index 911d5ba..008503a 100644 --- a/django_q/brokers/orm.py +++ b/django_q/brokers/orm.py @@ -17,7 +17,7 @@ def _timeout(): class ORM(Broker): @staticmethod def get_connection(list_key=Conf.PREFIX): - if transaction.get_autocommit(): # Only True when not in an atomic block + if transaction.get_autocommit(using=Conf.ORM): # Only True when not in an atomic block # Make sure stale connections in the broker thread are explicitly # closed before attempting DB access. # logger.debug("Broker thread calling close_old_connections") diff --git a/django_q/cluster.py b/django_q/cluster.py index 17d78ab..4304b7b 100644 --- a/django_q/cluster.py +++ b/django_q/cluster.py @@ -548,7 +548,7 @@ def scheduler(broker=None): broker = get_broker() close_old_django_connections() try: - with db.transaction.atomic(): + with db.transaction.atomic(using=Schedule.objects.db): for s in ( Schedule.objects.select_for_update() .exclude(repeats=0)