NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-22 11:38:45 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fixes #20243: Prevent scheduled system jobs from re-running multiple times

Browse Source
This commit is contained in:
Jeremy Stretch
2025-09-29 15:16:19 -04:00
parent bfd1adf0b5
commit f294cd1775
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/netbox/jobs.py
View File

@@ -4,6 +4,7 @@ from datetime import timedelta
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.utils.functional import classproperty from django.utils.functional import classproperty
from django.utils import timezone
from django_pglocks import advisory_lock from django_pglocks import advisory_lock
from rq.timeouts import JobTimeoutException from rq.timeouts import JobTimeoutException
@@ -113,7 +114,11 @@ class JobRunner(ABC):
# If the executed job is a periodic job, schedule its next execution at the specified interval. # If the executed job is a periodic job, schedule its next execution at the specified interval.
finally: finally:
if job.interval: if job.interval:
new_scheduled_time = (job.scheduled or job.started) + timedelta(minutes=job.interval) # Determine the new scheduled time. Cannot be earlier than one minute in the future.
new_scheduled_time = max([
(job.scheduled or job.started) + timedelta(minutes=job.interval),
timezone.now() + timedelta(minutes=1)
])
if job.object and getattr(job.object, "python_class", None): if job.object and getattr(job.object, "python_class", None):
kwargs["job_timeout"] = job.object.python_class.job_timeout kwargs["job_timeout"] = job.object.python_class.job_timeout
cls.enqueue( cls.enqueue(