Skip to content

Commit 958a671

Browse files
author
qifeng
committed
Merge branch 'systemime/perf_respect_django_routing' of github.com:systemime/django-celery-beat into systemime/perf_respect_django_routing
2 parents bd22e7f + dbb0cde commit 958a671

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

django_celery_beat/schedulers.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@
1515
from kombu.utils.json import dumps, loads
1616

1717
from django.conf import settings
18+
<<<<<<< HEAD
1819
from django.db import (
1920
DEFAULT_DB_ALIAS,
2021
close_old_connections,
2122
router,
2223
transaction
2324
)
25+
=======
26+
from django.db import transaction, close_old_connections, router, DEFAULT_DB_ALIAS
27+
>>>>>>> dbb0cde78b3b0bdcd444405cc4ac68ccf8835076
2428
from django.db.utils import DatabaseError, InterfaceError
2529
from django.core.exceptions import ObjectDoesNotExist
2630

@@ -300,7 +304,7 @@ def target_db(self):
300304
# If the project does not actually implement this method,
301305
# DEFAULT_DB_ALIAS will be automatically returned.
302306
# The exception will be located to the django routing section
303-
db = router.db_for_write(self.Model)
307+
db = router.db_for_write(self.Model
304308
return db
305309

306310
def _sync(self):

0 commit comments

Comments
 (0)