diff --git a/src/python/dm/common/constants/dmProcessingStatus.py b/src/python/dm/common/constants/dmProcessingStatus.py index 523bd70eee72161981db13dd919b83eed5e2123e..3cc2825741ee4ac3ef890bda6b6656cf30867c81 100755 --- a/src/python/dm/common/constants/dmProcessingStatus.py +++ b/src/python/dm/common/constants/dmProcessingStatus.py @@ -5,6 +5,7 @@ DM_PROCESSING_STATUS_ANY = 'any' DM_PROCESSING_STATUS_PENDING = 'pending' DM_PROCESSING_STATUS_RUNNING = 'running' +DM_PROCESSING_STATUS_FINALIZING = 'finalizing' DM_PROCESSING_STATUS_DONE = 'done' DM_PROCESSING_STATUS_FAILED = 'failed' DM_PROCESSING_STATUS_SKIPPED = 'skipped' @@ -15,6 +16,7 @@ DM_ALLOWED_PROCESSING_STATUS_LIST = [ DM_PROCESSING_STATUS_ANY, DM_PROCESSING_STATUS_PENDING, DM_PROCESSING_STATUS_RUNNING, + DM_PROCESSING_STATUS_FINALIZING, DM_PROCESSING_STATUS_DONE, DM_PROCESSING_STATUS_FAILED, DM_PROCESSING_STATUS_SKIPPED, diff --git a/src/python/dm/common/objects/daqInfo.py b/src/python/dm/common/objects/daqInfo.py index 2368786103a89957ce43aa937e779967c18abe68..468f4ea7eac00bb402a18407a3cdc3f423274d45 100755 --- a/src/python/dm/common/objects/daqInfo.py +++ b/src/python/dm/common/objects/daqInfo.py @@ -76,10 +76,12 @@ class DaqInfo(DmObject): self['percentageProcessed'] = '%.2f' % percentageProcessed self['percentageProcessingErrors'] = '%.2f' % percentageProcessingErrors - if self.get('endTime') and nCompletedFiles == nFiles: - daqStatus = 'done' - if nProcessingErrors: - daqStatus = 'failed' + if self.get('endTime'): + daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_FINALIZING + if nCompletedFiles == nFiles: + daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_DONE + if nProcessingErrors: + daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_FAILED lastFileProcessingErrorTime = self.get('lastFileProcessingErrorTime') lastFileProcessedTime = self.get('lastFileProcessedTime') endTime = lastFileProcessedTime