use processing status in common objects

src/python/dm/common/constants/dmProcessingStatus.py

@@ -21,3 +21,16 @@ DM_ALLOWED_PROCESSING_STATUS_LIST = [
     DM_PROCESSING_STATUS_ABORTING,
     DM_PROCESSING_STATUS_ABORTED
 ]
+
+DM_INACTIVE_PROCESSING_STATUS_LIST = [
+    DM_PROCESSING_STATUS_DONE,
+    DM_PROCESSING_STATUS_FAILED,
+    DM_PROCESSING_STATUS_SKIPPED,
+    DM_PROCESSING_STATUS_ABORTED
+]
+
+DM_ACTIVE_PROCESSING_STATUS_LIST = [
+    DM_PROCESSING_STATUS_PENDING,
+    DM_PROCESSING_STATUS_RUNNING,
+    DM_PROCESSING_STATUS_ABORTING
+]

src/python/dm/common/objects/daqInfo.py

@@ -5,6 +5,7 @@ import time
 import threading
 
 from dmObject import DmObject
+from dm.common.constants import dmProcessingStatus
 from dm.common.utility.dictUtility import DictUtility
 from dm.common.utility.timeUtility import TimeUtility
 
@@ -51,8 +52,8 @@ class DaqInfo(DmObject):
 
     def updateStatus(self):
         now = time.time()
-        daqStatus = self.get('status', 'running')
-        if daqStatus in ['done', 'failed']:          
+        daqStatus = self.get('status', dmProcessingStatus.DM_PROCESSING_STATUS_RUNNING)
+        if daqStatus in dmProcessingStatus.DM_INACTIVE_PROCESSING_STATUS_LIST:
             return 
         nFiles = self.get('nFiles', 0)
         nProcessedFiles = self.get('nProcessedFiles', 0)

src/python/dm/common/objects/directoryUploadInfo.py

@@ -4,6 +4,7 @@ import time
 import threading
 
 from dmObject import DmObject
+from dm.common.constants import dmProcessingStatus
 from dm.common.utility.dictUtility import DictUtility
 from dm.common.utility.timeUtility import TimeUtility
 
@@ -17,8 +18,8 @@ class DirectoryUploadInfo(DmObject):
 
     def updateStatus(self):
         now = time.time()
-        uploadStatus = self.get('status', 'running')
-        if uploadStatus in ['done', 'aborted', 'failed']:
+        uploadStatus = self.get('status', dmProcessingStatus.DM_PROCESSING_STATUS_RUNNING)
+        if uploadStatus in dmProcessingStatus.DM_INACTIVE_PROCESSING_STATUS_LIST:
             return 
 
         startTime = self.get('startTime', now)
@@ -30,10 +31,10 @@ class DirectoryUploadInfo(DmObject):
         for processorName in processingInfo.keys():
             processingEndTime = processingInfo[processorName].get('processingEndTime')
             status = processingInfo[processorName].get('status')
-            if status in ['aborted', 'failed']:
+            if status in [dmProcessingStatus.DM_PROCESSING_STATUS_ABORTED, dmProcessingStatus.DM_PROCESSING_STATUS_FAILED]:
                 uploadStatus = status
 
-            if not processingEndTime and status != 'skipped':
+            if not processingEndTime and status != dmProcessingStatus.DM_PROCESSING_STATUS_SKIPPED:
                 endTime = None
                 break
 

src/python/dm/common/objects/uploadInfo.py

@@ -4,6 +4,7 @@ import time
 import threading
 
 from dmObject import DmObject
+from dm.common.constants import dmProcessingStatus
 from dm.common.utility.dictUtility import DictUtility
 from dm.common.utility.timeUtility import TimeUtility
 
@@ -58,8 +59,8 @@ class UploadInfo(DmObject):
 
     def updateStatus(self):
         now = time.time()
-        uploadStatus = self.get('status', 'running')
-        if uploadStatus in ['done', 'aborted', 'failed']:
+        uploadStatus = self.get('status', dmProcessingStatus.DM_PROCESSING_STATUS_RUNNING)
+        if uploadStatus in dmProcessingStatus.DM_INACTIVE_PROCESSING_STATUS_LIST:
             return 
         nFiles = self.get('nFiles', 0)
         nProcessedFiles = self.get('nProcessedFiles', 0)