NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 09:51:22 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Add job timeout handling in JobRunner for periodic jobs

Browse Source
This commit is contained in:
Artem Kotik 2024-10-16 11:39:23 +02:00 committed by Jeremy Stretch
parent aa3f4cb5f5
commit e8e95f5e97
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/netbox/jobs.py
View File

@ -68,6 +68,8 @@ class JobRunner(ABC):
finally: finally:
if job.interval: if job.interval:
new_scheduled_time = (job.scheduled or job.started) + timedelta(minutes=job.interval) new_scheduled_time = (job.scheduled or job.started) + timedelta(minutes=job.interval)
if job.object and getattr(job.object, "python_class", None):
kwargs["job_timeout"] = job.object.python_class.job_timeout
cls.enqueue( cls.enqueue(
instance=job.object, instance=job.object,
user=job.user, user=job.user,