diff --git a/src/python/dm/common/constants/dmProcessingStatus.py b/src/python/dm/common/constants/dmProcessingStatus.py index 439062daa87f046edb4111d451caf584d13b9a85..523bd70eee72161981db13dd919b83eed5e2123e 100755 --- a/src/python/dm/common/constants/dmProcessingStatus.py +++ b/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 +] diff --git a/src/python/dm/common/objects/daqInfo.py b/src/python/dm/common/objects/daqInfo.py index fffd5a5911cc00479260b7f57ac5948e4943c6bc..2368786103a89957ce43aa937e779967c18abe68 100755 --- a/src/python/dm/common/objects/daqInfo.py +++ b/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) diff --git a/src/python/dm/common/objects/directoryUploadInfo.py b/src/python/dm/common/objects/directoryUploadInfo.py index 6c8f16a8ab2fdb990e3676d5ce07bf86a5e0a01d..d256a1366a8a2af5fb9f617aee6a4a5282eb7f02 100755 --- a/src/python/dm/common/objects/directoryUploadInfo.py +++ b/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 diff --git a/src/python/dm/common/objects/uploadInfo.py b/src/python/dm/common/objects/uploadInfo.py index 1b0e096b42f4c6ed79ad0512a7346e346a2c7ed6..5fc59a35005e1c8f914f1f1b3c1e72ba2145f37e 100755 --- a/src/python/dm/common/objects/uploadInfo.py +++ b/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)