Merge pull request PanDAWMS#274 from tmaeno/master

added error and dialog to output of get_events_status
fbarreir · Dec 8, 2023 · de74ccb · de74ccb
2 parents 5ee2a29 + 6599fce
commit de74ccb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/PandaPkgInfo.py b/PandaPkgInfo.py
@@ -1 +1 @@
-release_version = "0.0.71"
+release_version = "0.0.72"
diff --git a/pandaserver/taskbuffer/OraDBProxy.py b/pandaserver/taskbuffer/OraDBProxy.py
@@ -26595,7 +26595,7 @@ def get_events_status(self, ids):
         try:
             ids = json.loads(ids)
             # sql to get event stats
-            sql = f"SELECT jediTaskID,fileID,attemptNr,job_processID,status FROM {panda_config.schemaJEDI}.JEDI_Events "
+            sql = f"SELECT jediTaskID,fileID,attemptNr,job_processID,status,error_code,error_diag FROM {panda_config.schemaJEDI}.JEDI_Events "
             sql += "WHERE jediTaskID=:jediTaskID AND PandaID=:PandaID "
             ret_val = {}
             for tmp_id in ids:
@@ -26610,9 +26610,9 @@ def get_events_status(self, ids):
                 self.cur.execute(sql + comment, varMap)
                 resM = self.cur.fetchall()
                 tmp_map = {}
-                for jediTaskID, fileID, attemptNr, job_processID, eventStatus in resM:
+                for jediTaskID, fileID, attemptNr, job_processID, eventStatus, error_code, error_diag in resM:
                     eventRangeID = self.makeEventRangeID(jediTaskID, tmp_id["panda_id"], fileID, job_processID, attemptNr)
-                    tmp_map[eventRangeID] = EventServiceUtils.ES_status_map[eventStatus]
+                    tmp_map[eventRangeID] = {"status": EventServiceUtils.ES_status_map[eventStatus], "error": error_code, "dialog": error_diag}
                 ret_val[tmp_id["panda_id"]] = tmp_map
                 # commit
                 if not self._commit():
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		release_version = "0.0.71"
		release_version = "0.0.72"