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

Properly convert datetime from backend. Fix: #323, Fix: #330 #332

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Properly convert datetime from backend. Fix: #323, Fix: #330 #332

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79deeb3
Properly convert datetime from backend. Fix: #323, Fix: #330
spoksss Apr 7, 2020
d86546d
Merge branch 'main' into master
auvipy Mar 13, 2023
973c587
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions django_celery_beat/schedulers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import math
from multiprocessing.util import Finalize

import pytz
Copy link
Contributor

@cclauss cclauss Dec 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Django v5 drops support for pytz timezones.

from celery import current_app, schedules
from celery.beat import ScheduleEntry, Scheduler
from celery.utils.log import get_logger
Expand Down Expand Up @@ -129,6 +130,21 @@ def is_due(self):
# Don't recheck
return schedules.schedstate(False, NEVER_CHECK_TIMEOUT)

# When Django settings USE_TZ is False and Django settings TIME_ZONE is set
# value of TIME_ZINE is the time zone in which Django will store all datetimes.
# Because of that if datetime is naive we should use it as source timezone
# celery.utils.time.maybe_make_aware - always convert naive datetime to UTC
# which may be wrong in Django sicase.
django_timezone = getattr(settings, 'TIME_ZONE', None)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will need a proper test case

django_use_tz = getattr(settings, 'USE_TZ', None)
if (not django_use_tz
and django_timezone
and self.last_run_at.tzinfo is None
and self.app.timezone):
source_timezone = pytz.timezone(django_timezone)
last_run_at_django_tz = source_timezone.localize(self.last_run_at)
self.last_run_at = last_run_at_django_tz.astimezone(self.app.timezone)

# CAUTION: make_aware assumes settings.TIME_ZONE for naive datetimes,
# while maybe_make_aware assumes utc for naive datetimes
tz = self.app.timezone
Expand Down