Merge pull request #86 from acsone/7.0-retryable_runner-lga

7.0 - manage retryable job with runner
OCA · Jul 2, 2015 · 1d5da3b · 1d5da3b
2 parents 66fb391 + 95e9407
commit 1d5da3b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/connector/controllers/main.py b/connector/controllers/main.py
@@ -51,7 +51,7 @@ def runjob(self, request, db, job_uuid, **kw):
         def retry_postpone(job, message, seconds=None):
             with session_hdl.session() as session:
                 job.postpone(result=message, seconds=seconds)
-                job.set_pending(self)
+                job.set_pending(self, reset_retry=False)
                 self.job_storage_class(session).store(job)
 
         with session_hdl.session() as session:

diff --git a/connector/queue/job.py b/connector/queue/job.py
@@ -559,12 +559,13 @@ def eta(self, value):
                              " it must be an 'int', a 'timedelta' "
                              "or a 'datetime'" % type(value))
 
-    def set_pending(self, result=None):
+    def set_pending(self, result=None, reset_retry=True):
         self.state = PENDING
         self.date_enqueued = None
         self.date_started = None
         self.worker_uuid = None
-        self.retry = 0
+        if reset_retry:
+            self.retry = 0
         if result is not None:
             self.result = result