Fix ClockedSchedule and PeriodicTasks showing UTC time when Time Zone is enabled. #464
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
auvipy
requested changes
Dec 11, 2021
django_celery_beat/models.py
Outdated
| @@ -220,7 +221,8 @@ class Meta: | |||
| ordering = ['clocked_time'] | |||
|
|
|||
| def __str__(self): | |||
| return '{}'.format(self.clocked_time) | |||
| return localtime(self.clocked_time).strftime("%d %B %Y %I:%M %p") | |||
There was a problem hiding this comment.
can unit test added for this change?
There was a problem hiding this comment.
I think return '{}'.format(make_aware(self.clocked_time)) is better.
There was a problem hiding this comment.
Yes @lvelvee I believe so.
I have done another commit with this change after fetching the new base code.
|
This pull request introduces 1 alert when merging 13d403a into be0651f - view on LGTM.com new alerts:
|
|
can you add small unit test for it? |
auvipy
approved these changes
Dec 17, 2021
|
@auvipy |
|
ok please come with it today please |
Done #485 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This contribution fixes 2 serious issues when displaying timing on Django Admin:
1- When time zone is used, celery beat ClockedSchedule model shows two different times which causes discrepancies.
For example, When you enter the django admin > Clocked > list display item, you will find the time is right (w.r.t your TZ), like: Dec. 3, 2021, 6:11 p.m.
However, when you click on this item to open the detailed view it will show the UTC time of the clock you entered reesulting in discrepancies, like: 2021-12-03 16:11:57+00:00
2- When time zone is used, celery beat PeriodicTasks model shows the the name of the task and the datetime of the task in UTC not in the local time zone chosen, which causes great confusion in the periodic tasks.
For example, the PeriodicTasks list will have a task like this: "Send Email: 2021-12-03 16:20:57+00:00" but as a matter of fact this should be 6:20 PM not 4:20 PM as shown in the list, although I have CELERY_ENABLE_UTC = False and CELERY_TIMEZONE = 'Africa/Cairo'
This fix solves both problems and shows the correct time with respect to time zone.