Просмотр исходного кода

Add job timeout handling in JobRunner for periodic jobs

Artem Kotik 1 год назад
Родитель
Сommit
e8e95f5e97
1 измененных файлов с 2 добавлено и 0 удалено
  1. 2 0
      netbox/netbox/jobs.py

+ 2 - 0
netbox/netbox/jobs.py

@@ -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,