mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-07 03:38:12 +08:00
Merge pull request #428 from hhyo/hhyo-patch-1
Fix issue when using USE_TZ=False with MySQL
This commit is contained in:
+4
-1
@@ -20,6 +20,7 @@ import arrow
|
|||||||
|
|
||||||
# Django
|
# Django
|
||||||
from django import db
|
from django import db
|
||||||
|
from django.conf import settings
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
@@ -591,7 +592,9 @@ def scheduler(broker=None):
|
|||||||
next_run = next_run.shift(years=+1)
|
next_run = next_run.shift(years=+1)
|
||||||
if Conf.CATCH_UP or next_run > arrow.utcnow():
|
if Conf.CATCH_UP or next_run > arrow.utcnow():
|
||||||
break
|
break
|
||||||
s.next_run = next_run.datetime
|
# arrow always returns a tz aware datetime, and we don't want
|
||||||
|
# this when we explicitly configured django with USE_TZ=False
|
||||||
|
s.next_run = next_run.datetime if settings.USE_TZ else next_run.datetime.replace(tzinfo=None)
|
||||||
s.repeats += -1
|
s.repeats += -1
|
||||||
# send it to the cluster
|
# send it to the cluster
|
||||||
q_options["broker"] = broker
|
q_options["broker"] = broker
|
||||||
|
|||||||
Reference in New Issue
Block a user