use constants

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