Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issues when using multiple databases with a database router #440

Merged
merged 2 commits into from May 27, 2020
Merged

Fix issues when using multiple databases with a database router #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85a9f33
Check for the right database when querying for get_autocommit
maerteijn May 1, 2020
f0546bc
Lock the Scheduler model for the database it's using
maerteijn May 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion django_q/brokers/orm.py
View file
Open in desktop
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion django_q/cluster.py
View file
Open in desktop
Expand Up @@ -546,7 +546,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)
Expand Down