From 7820f82760947900e12c455a66d5414dad146237 Mon Sep 17 00:00:00 2001 From: Daniel Ursache Dogariu Date: Thu, 2 Apr 2026 17:26:45 +0300 Subject: [PATCH] Prefer timedelta from timezone module --- backend/donations/views/common/misc.py | 10 +++++----- backend/q_heartbeat/management/commands/qheartbeat.py | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/backend/donations/views/common/misc.py b/backend/donations/views/common/misc.py index 5a5b4c3a..b5775813 100644 --- a/backend/donations/views/common/misc.py +++ b/backend/donations/views/common/misc.py @@ -22,11 +22,11 @@ def get_was_last_job_recent(ngo: Ngo | None) -> bool: last_job_date = last_ngo_job.date_created last_job_status = last_ngo_job.status - timedelta = datetime.timedelta(0) + td = datetime.timedelta(0) if last_job_status != JobStatusChoices.ERROR: - timedelta = datetime.timedelta(minutes=settings.TIMEDELTA_FORMS_DOWNLOAD_MINUTES) + td = datetime.timedelta(minutes=settings.TIMEDELTA_FORMS_DOWNLOAD_MINUTES) - if last_job_date > now - timedelta: + if last_job_date > now - td: return True return False @@ -36,9 +36,9 @@ def archive_job_was_recent(job_status: str, job_created: datetime) -> bool: if job_status == JobStatusChoices.ERROR: return False - timedelta = datetime.timedelta(minutes=settings.TIMEDELTA_FORMS_DOWNLOAD_MINUTES) + td = datetime.timedelta(minutes=settings.TIMEDELTA_FORMS_DOWNLOAD_MINUTES) - if job_created > timezone.now() - timedelta: + if job_created > timezone.now() - td: return True return False diff --git a/backend/q_heartbeat/management/commands/qheartbeat.py b/backend/q_heartbeat/management/commands/qheartbeat.py index a0591a1b..f17e0147 100644 --- a/backend/q_heartbeat/management/commands/qheartbeat.py +++ b/backend/q_heartbeat/management/commands/qheartbeat.py @@ -1,4 +1,5 @@ import logging +from datetime import timedelta import psutil from django.core.management.base import BaseCommand @@ -41,7 +42,7 @@ def handle(self, *args, **options): return # Check if there were any successful tasks started in the past N minutes - cutoff = timezone.now() - timezone.timedelta(minutes=check_minutes) + cutoff = timezone.now() - timedelta(minutes=check_minutes) if not Success.objects.filter(started__gte=cutoff).exists(): # If there are no successful tasks, then try to terminate the workers logger.error("The task queue seems to be stuck, attempting to terminate it")