Split cancel & abort TTLs

Author: sylvinus

mrq/config.py

@@ -156,14 +156,21 @@ def add_parser_args(parser, config_type):
         default=7 * 24 * 3600,
         action='store',
         type=int,
-        help='Seconds the results are kept in MongoDB when status in (success)')
+        help='Seconds the results are kept in MongoDB when status is success')
 
     parser.add_argument(
-        '--default_job_aborted_or_canceled_ttl',
+        '--default_job_abort_ttl',
         default=24 * 3600,
         action='store',
         type=int,
-        help='Seconds the tasks are kept in MongoDB when status in (cancel, abort)')
+        help='Seconds the tasks are kept in MongoDB when status is abort')
+
+    parser.add_argument(
+        '--default_job_cancel_ttl',
+        default=24 * 3600,
+        action='store',
+        type=int,
+        help='Seconds the tasks are kept in MongoDB when status is cancel')
 
     parser.add_argument(
         '--default_job_timeout',

mrq/job.py

@@ -23,7 +23,8 @@ class Job(object):
 
     timeout = None
     result_ttl = None
-    aborted_or_canceled_ttl = None
+    abort_ttl = None
+    cancel_ttl = None
     max_retries = None
     retry_delay = None
 
@@ -128,7 +129,8 @@ def set_data(self, data):
 
             self.timeout = task_def.get("timeout", cfg["default_job_timeout"])
             self.result_ttl = task_def.get("result_ttl", cfg["default_job_result_ttl"])
-            self.aborted_or_canceled_ttl = task_def.get("aborted_or_canceled_ttl", cfg["default_job_aborted_or_canceled_ttl"])
+            self.abort_ttl = task_def.get("abort_ttl", cfg["default_job_abort_ttl"])
+            self.cancel_ttl = task_def.get("cancel_ttl", cfg["default_job_cancel_ttl"])
             self.max_retries = task_def.get("max_retries", cfg["default_job_max_retries"])
             self.retry_delay = task_def.get("retry_delay", cfg["default_job_retry_delay"])
 
@@ -342,15 +344,15 @@ def save_success(self, result=None):
 
     def save_cancel(self):
 
-        dateexpires = datetime.datetime.utcnow() + datetime.timedelta(seconds=self.aborted_or_canceled_ttl)
+        dateexpires = datetime.datetime.utcnow() + datetime.timedelta(seconds=self.cancel_ttl)
         updates = {
             "dateexpires": dateexpires
         }
 
         self._save_status("cancel", updates)
 
     def save_abort(self):
-        dateexpires = datetime.datetime.utcnow() + datetime.timedelta(seconds=self.aborted_or_canceled_ttl)
+        dateexpires = datetime.datetime.utcnow() + datetime.timedelta(seconds=self.abort_ttl)
         updates = {
             "dateexpires": dateexpires
         }