exptl parse UK Caving blog

databaseReset.py

@@ -238,15 +238,16 @@ class JobQueue():
         for runfunction in self.queue:
             start = time.time()
             memstart = get_process_memory()
+            jobname, jobparser = runfunction
             #--------------------
-            runfunction[1]()    #  invokes function passed in the second item in the tuple
+            jobparser()    #  invokes function passed in the second item in the tuple
             #--------------------
             memend = get_process_memory()
             duration = time.time()-start
             #print(" - MEMORY start:{:.3f} MB end:{:.3f} MB change={:.3f} MB".format(memstart,memend, ))
-            print("\n*- Ended \"",  runfunction[0], f"\"  {duration:.1f} seconds + {memend - memstart:.3f} MB ({memend:.3f} MB)")
-            self.results[runfunction[0]].pop()  # the null item
-            self.results[runfunction[0]].append(duration)
+            print("\n*- Ended \"",  jobname, f"\"  {duration:.1f} seconds + {memend - memstart:.3f} MB ({memend:.3f} MB)")
+            self.results[jobname].pop()  # the null item
+            self.results[jobname].append(duration)
                
 
         jobend = time.time()