[IMP] queue_job: increment 'retry' when re-queuing job that have been…

… killed
OCA · Dec 6, 2024 · b0f9f59 · b0f9f59
1 parent 3cb2a4e
commit b0f9f59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/queue_job/job.py b/queue_job/job.py
@@ -542,6 +542,9 @@ def perform(self):
 
         The job is executed with the user which has initiated it.
         """
+        if self.max_retries and self.retry >= self.max_retries:
+            raise FailedJobError("Max. retries (%d) reached" % (self.max_retries))
+
         self.retry += 1
         try:
             self.result = self.func(*tuple(self.args), **self.kwargs)

diff --git a/queue_job/jobrunner/runner.py b/queue_job/jobrunner/runner.py
@@ -354,7 +354,8 @@ def reset_dead_jobs(self):
             UPDATE
                 queue_job
             SET
-                state='pending'
+                state='pending',
+                retry=retry+1
             WHERE
                 id IN (
                     SELECT