From b2ccd4df043472bb1babf6081dc47f7934deeae4 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 12 Apr 2016 18:48:50 +0000
Subject: [PATCH] use constants
---
src/python/dm/common/processing/fileProcessingThread.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/python/dm/common/processing/fileProcessingThread.py b/src/python/dm/common/processing/fileProcessingThread.py
index f83762d3..f535b56f 100755
--- a/src/python/dm/common/processing/fileProcessingThread.py
+++ b/src/python/dm/common/processing/fileProcessingThread.py
@@ -2,6 +2,7 @@
import threading
import time
+from dm.common.constants import dmProcessingStatus
from dm.common.utility.loggingManager import LoggingManager
@@ -31,7 +32,7 @@ class FileProcessingThread(threading.Thread):
try:
statusMonitor = fileInfo.get('statusMonitor')
- if statusMonitor and statusMonitor.get('status') == 'aborting':
+ if statusMonitor and statusMonitor.get('status') == dmProcessingStatus.DM_PROCESSING_STATUS_ABORTING:
self.logger.debug('File %s processing is cancelled' % (filePath))
endProcessingTime = time.time()
statusMonitor.fileProcessingCancelled(filePath, endProcessingTime)
@@ -87,7 +88,7 @@ class FileProcessingThread(threading.Thread):
return
else:
retryWaitPeriod = processor.getRetryWaitPeriodInSeconds()
- self.logger.debug('%s will retry processing file %s in %s seconds' % (processorName, filePath, retryWaitPeriod))
+ self.logger.debug('%s may retry processing file %s after at least %s seconds' % (processorName, filePath, retryWaitPeriod))
self.fileProcessingQueue.push(fileInfo, retryWaitPeriod)
# Do not process this file further until
# this plugin is done
--
GitLab