Ticket #209: 0001-BibSched-improve-task_low_level_submission-args-pars.patch

modules/bibsched/lib/bibtask.py

@@ -174 +174 @@
                 special_name = opt[1]
         return special_name
 
+    def get_runtime(argv):
+        """Try to get the runtime by analysing the arguments."""
+        runtime = time.strftime("%Y-%m-%d %H:%M:%S")
+        argv = list(argv)
+        while True:
+            try:
+                opts, args = getopt.gnu_getopt(argv, 't:', ['runtime='])
+            except getopt.GetoptError, err:
+                ## We remove one by one all the non recognized parameters
+                if len(err.opt) > 1:
+                    argv = [arg for arg in argv if arg != '--%s' % err.opt and not arg.startswith('--%s=' % err.opt)]
+                else:
+                    argv = [arg for arg in argv if not arg.startswith('-%s' % err.opt)]
+            else:
+                break
+        for opt in opts:
+            if opt[0] in ('-t', '--runtime'):
+                try:
+                    runtime = get_datetime(opt[1])
+                except ValueError:
+                    pass
+        return runtime
+
+    def get_sleeptime(argv):
+        """Try to get the runtime by analysing the arguments."""
+        sleeptime = ""
+        argv = list(argv)
+        while True:
+            try:
+                opts, args = getopt.gnu_getopt(argv, 's:', ['sleeptime='])
+            except getopt.GetoptError, err:
+                ## We remove one by one all the non recognized parameters
+                if len(err.opt) > 1:
+                    argv = [arg for arg in argv if arg != '--%s' % err.opt and not arg.startswith('--%s=' % err.opt)]
+                else:
+                    argv = [arg for arg in argv if not arg.startswith('-%s' % err.opt)]
+            else:
+                break
+        for opt in opts:
+            if opt[0] in ('-s', '--sleeptime'):
+                try:
+                    sleeptime = opt[1]
+                except ValueError:
+                    pass
+        return sleeptime
 
     task_id = None
     try:
@@ -188 +233 @@
         argv = new_argv
         priority = get_priority(argv)
         special_name = get_special_name(argv)
+        runtime = get_runtime(argv)
+        sleeptime = get_sleeptime(argv)
         argv = tuple([os.path.join(CFG_BINDIR, name)] + list(argv))
 
         if special_name:
@@ -198 +245 @@
         ## submit task:
         task_id = run_sql("""INSERT INTO schTASK (proc,user,
             runtime,sleeptime,status,progress,arguments,priority)
-            VALUES (%s,%s,NOW(),'','WAITING',%s,%s,%s)""",
-            (name, user, verbose_argv, marshal.dumps(argv), priority))
+            VALUES (%s,%s,%s,%s,'WAITING',%s,%s,%s)""",
+            (name, user, runtime, sleeptime, verbose_argv, marshal.dumps(argv), priority))
 
     except Exception:
         register_exception(alert_admin=True)