Make periodic task retry time configurable

Syslifters · Jan 14, 2025 · cd04770 · cd04770
1 parent 6969a0a
commit cd04770
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/api/src/reportcreator_api/tasks/models.py b/api/src/reportcreator_api/tasks/models.py
@@ -29,6 +29,8 @@ class PeriodicTaskSpec:
     id: str
     schedule: timedelta
     func: callable
+    retry: timedelta = timedelta(minutes=10)
+    max_runtime: timedelta = timedelta(minutes=10)
 
 
 @dataclasses.dataclass()
@@ -59,11 +61,12 @@ def unregister(self, task: PeriodicTaskSpec):
 periodic_task_registry = PeriodicTaskRegistry()
 
 
-def periodic_task(schedule: timedelta, id: str|None = None):
+def periodic_task(schedule: timedelta, id: str|None = None, retry: timedelta|None = None):
     def inner(func):
         periodic_task_registry.register(PeriodicTaskSpec(
             id=id or f'{func.__module__}.{func.__name__}',
             schedule=schedule,
+            retry=retry or (schedule / 10),
             func=func,
         ))
         return func

diff --git a/api/src/reportcreator_api/tasks/querysets.py b/api/src/reportcreator_api/tasks/querysets.py
@@ -1,5 +1,4 @@
 import logging
-from datetime import timedelta
 
 import elasticapm
 from asgiref.sync import iscoroutinefunction, sync_to_async
@@ -19,8 +18,8 @@ async def get_pending_tasks(self):
             model = task_models.get(t_id)
             # Remove non-pending tasks
             if model and (
-                (model.status == TaskStatus.RUNNING and model.started > timezone.now() - timedelta(minutes=10)) or \
-                (model.status == TaskStatus.FAILED and model.started > timezone.now() - timedelta(minutes=10)) or \
+                (model.status == TaskStatus.RUNNING and model.started > timezone.now() - spec.max_runtime) or \
+                (model.status == TaskStatus.FAILED and model.started > timezone.now() - spec.retry) or \
                 (model.status == TaskStatus.SUCCESS and model.started > timezone.now() - spec.schedule)
             ):
                 continue