Skip to content
Snippets Groups Projects
Commit 7a35df3a authored by sveseli's avatar sveseli
Browse files

introduce new status for stopping daqs

parent 4253d91c
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
DM_PROCESSING_STATUS_ANY = 'any' DM_PROCESSING_STATUS_ANY = 'any'
DM_PROCESSING_STATUS_PENDING = 'pending' DM_PROCESSING_STATUS_PENDING = 'pending'
DM_PROCESSING_STATUS_RUNNING = 'running' DM_PROCESSING_STATUS_RUNNING = 'running'
DM_PROCESSING_STATUS_FINALIZING = 'finalizing'
DM_PROCESSING_STATUS_DONE = 'done' DM_PROCESSING_STATUS_DONE = 'done'
DM_PROCESSING_STATUS_FAILED = 'failed' DM_PROCESSING_STATUS_FAILED = 'failed'
DM_PROCESSING_STATUS_SKIPPED = 'skipped' DM_PROCESSING_STATUS_SKIPPED = 'skipped'
...@@ -15,6 +16,7 @@ DM_ALLOWED_PROCESSING_STATUS_LIST = [ ...@@ -15,6 +16,7 @@ DM_ALLOWED_PROCESSING_STATUS_LIST = [
DM_PROCESSING_STATUS_ANY, DM_PROCESSING_STATUS_ANY,
DM_PROCESSING_STATUS_PENDING, DM_PROCESSING_STATUS_PENDING,
DM_PROCESSING_STATUS_RUNNING, DM_PROCESSING_STATUS_RUNNING,
DM_PROCESSING_STATUS_FINALIZING,
DM_PROCESSING_STATUS_DONE, DM_PROCESSING_STATUS_DONE,
DM_PROCESSING_STATUS_FAILED, DM_PROCESSING_STATUS_FAILED,
DM_PROCESSING_STATUS_SKIPPED, DM_PROCESSING_STATUS_SKIPPED,
......
...@@ -76,10 +76,12 @@ class DaqInfo(DmObject): ...@@ -76,10 +76,12 @@ class DaqInfo(DmObject):
self['percentageProcessed'] = '%.2f' % percentageProcessed self['percentageProcessed'] = '%.2f' % percentageProcessed
self['percentageProcessingErrors'] = '%.2f' % percentageProcessingErrors self['percentageProcessingErrors'] = '%.2f' % percentageProcessingErrors
if self.get('endTime') and nCompletedFiles == nFiles: if self.get('endTime'):
daqStatus = 'done' daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_FINALIZING
if nProcessingErrors: if nCompletedFiles == nFiles:
daqStatus = 'failed' daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_DONE
if nProcessingErrors:
daqStatus = dmProcessingStatus.DM_PROCESSING_STATUS_FAILED
lastFileProcessingErrorTime = self.get('lastFileProcessingErrorTime') lastFileProcessingErrorTime = self.get('lastFileProcessingErrorTime')
lastFileProcessedTime = self.get('lastFileProcessedTime') lastFileProcessedTime = self.get('lastFileProcessedTime')
endTime = lastFileProcessedTime endTime = lastFileProcessedTime
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment