From 759724abbe19890da73c6363d423afcc290b0f16 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Thu, 25 Feb 2016 14:25:06 +0000
Subject: [PATCH] fixes for md5sum file path and for processing file after one
plugin fails
---
src/python/dm/common/processing/fileProcessingThread.py | 3 ++-
src/python/dm/common/utility/fileUtility.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/python/dm/common/processing/fileProcessingThread.py b/src/python/dm/common/processing/fileProcessingThread.py
index 76bcdd79..f83762d3 100755
--- a/src/python/dm/common/processing/fileProcessingThread.py
+++ b/src/python/dm/common/processing/fileProcessingThread.py
@@ -83,7 +83,8 @@ class FileProcessingThread(threading.Thread):
endProcessingTime = time.time()
if statusMonitor:
statusMonitor.fileProcessingError(filePath, processingError, endProcessingTime)
- self.logger.debug('No more %s retries left for file %s' % (processorName, filePath))
+ self.logger.debug('No more %s retries left for file %s, remaining plugins will not process it' % (processorName, filePath))
+ return
else:
retryWaitPeriod = processor.getRetryWaitPeriodInSeconds()
self.logger.debug('%s will retry processing file %s in %s seconds' % (processorName, filePath, retryWaitPeriod))
diff --git a/src/python/dm/common/utility/fileUtility.py b/src/python/dm/common/utility/fileUtility.py
index 26070214..f4f4c7d6 100755
--- a/src/python/dm/common/utility/fileUtility.py
+++ b/src/python/dm/common/utility/fileUtility.py
@@ -9,7 +9,7 @@ class FileUtility:
@classmethod
def getMd5Sum(cls, filePath, fileInfo={}):
- p = DmSubprocess.getSubprocess('md5sum %s' % filePath)
+ p = DmSubprocess.getSubprocess('md5sum "%s"' % filePath)
p.run()
md5Sum = p.getStdOut().split()[0]
fileInfo['md5Sum'] = md5Sum
--
GitLab