6.2.4

vanderbilt-redcap · Nov 22, 2023 · f137663 · f137663
1 parent 04814f2
commit f137663
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 71 deletions.
diff --git a/CareerDev.php b/CareerDev.php
@@ -22,7 +22,7 @@ class CareerDev {
 	public static $passedModule = NULL;
 
 	public static function getVersion() {
-		return "6.2.3";
+		return "6.2.4";
 	}
 
 	public static function getLockFile($pid) {

diff --git a/classes/Crons.php b/classes/Crons.php
@@ -579,7 +579,7 @@ public function runBatchJobs($numRunBeforeInCron = 0) {
 
         Application::log("Currently running ".$firstBatchQueue['method']." for pid ".$firstBatchQueue['pid']." with status ".$firstBatchQueue['status'], $firstBatchQueue['pid']);
         if ($firstBatchQueue['status'] == "RUN") {
-            $startTs = isset($firstBatchQueue['startTs']) && is_numeric($batchQueue[0]['startTs']) ? $firstBatchQueue['startTs'] : 0;
+            $startTs = isset($firstBatchQueue['startTs']) && is_numeric($firstBatchQueue['startTs']) ? $firstBatchQueue['startTs'] : 0;
             $timespan = 90 * 60;   // max of 90 minutes per segment
             Application::log("Running until ".date("Y-m-d H:i:s", $startTs + $timespan));
             if (time() > $startTs + $timespan) {
@@ -593,7 +593,7 @@ public function runBatchJobs($numRunBeforeInCron = 0) {
         }
         if (in_array($firstBatchQueue['status'], ["DONE", "ERROR"])) {
             if ($firstBatchQueue['status'] == "ERROR") {
-                Application::log("Saving ERROR ".json_encode($batchQueue[0]));
+                Application::log("Saving ERROR ".json_encode($firstBatchQueue));
                 $errorJobs = self::getErrorsFromDB();
                 self::addErrorToDB($firstBatchQueue, $errorJobs);
             }

diff --git a/reporting/upload_react/run/main.117cd721.js b/reporting/upload_react/run/main.117cd721.js
diff --git a/reporting/upload_react/run/main.59588454.js b/reporting/upload_react/run/main.59588454.js
diff --git a/reporting/upload_react/run/main.59588454.js.LICENSE.txt b/reporting/upload_react/run/main.59588454.js.LICENSE.txt
diff --git a/reporting/upload_react/run/main.59588454.js.map b/reporting/upload_react/run/main.59588454.js.map