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

Fix timezone aware comparison. #223

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix timezone aware comparison. #223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 8 deletions django_cron/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import logging
from datetime import datetime, timedelta
from datetime import timedelta
import traceback
import time
import sys
Expand Down Expand Up @@ -103,31 +103,32 @@ def should_run_now(self, force=False):
"""
self.user_time = None
self.previously_ran_successful_cron = None
now = get_current_time()

# If we pass --force options, we force cron run
if force:
return True

if cron_job.schedule.run_monthly_on_days is not None:
if not datetime.today().day in cron_job.schedule.run_monthly_on_days:
if now.day not in cron_job.schedule.run_monthly_on_days:
return False

if cron_job.schedule.run_weekly_on_days is not None:
if not datetime.today().weekday() in cron_job.schedule.run_weekly_on_days:
if now.weekday() not in cron_job.schedule.run_weekly_on_days:
return False

if cron_job.schedule.retry_after_failure_mins:
# We check last job - success or not
last_job = (
CronJobLog.objects.filter(code=cron_job.code)
.order_by('-start_time')
.exclude(start_time__gt=datetime.today())
.exclude(start_time__gt=now)
.first()
)
if (
last_job
and not last_job.is_success
and get_current_time() + timedelta(seconds=cron_job.schedule.run_tolerance_seconds)
and now + timedelta(seconds=cron_job.schedule.run_tolerance_seconds)
<= last_job.start_time
+ timedelta(minutes=cron_job.schedule.retry_after_failure_mins)
):
Expand All @@ -137,13 +138,13 @@ def should_run_now(self, force=False):
try:
self.previously_ran_successful_cron = CronJobLog.objects.filter(
code=cron_job.code, is_success=True
).exclude(start_time__gt=datetime.today()).latest('start_time')
).exclude(start_time__gt=now).latest('start_time')
except CronJobLog.DoesNotExist:
pass

if self.previously_ran_successful_cron:
if (
get_current_time() + timedelta(seconds=cron_job.schedule.run_tolerance_seconds)
now + timedelta(seconds=cron_job.schedule.run_tolerance_seconds)
> self.previously_ran_successful_cron.start_time
+ timedelta(minutes=cron_job.schedule.run_every_mins)
):
Expand All @@ -154,7 +155,6 @@ def should_run_now(self, force=False):
if cron_job.schedule.run_at_times:
for time_data in cron_job.schedule.run_at_times:
user_time = time.strptime(time_data, "%H:%M")
now = get_current_time()
actual_time = time.strptime("%s:%s" % (now.hour, now.minute), "%H:%M")
if actual_time >= user_time:
qset = CronJobLog.objects.filter(
Expand Down