From 4dcf78681f6fc689006150b3a9cbc3f2b3fd0f6e Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 9 Nov 2016 15:45:38 +0000
Subject: [PATCH] logging changes
---
src/python/dm/__init__.py | 2 +-
.../dm/common/processing/fileProcessingThread.py | 11 ++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py
index 04562a4f..c9bd87fb 100644
--- a/src/python/dm/__init__.py
+++ b/src/python/dm/__init__.py
@@ -1 +1 @@
-__version__ = "0.15 (2016.10.26)"
+__version__ = "0.15 (2016.10.31)"
diff --git a/src/python/dm/common/processing/fileProcessingThread.py b/src/python/dm/common/processing/fileProcessingThread.py
index 0e9b8a25..579e2094 100755
--- a/src/python/dm/common/processing/fileProcessingThread.py
+++ b/src/python/dm/common/processing/fileProcessingThread.py
@@ -32,13 +32,16 @@ class FileProcessingThread(threading.Thread):
try:
statusMonitor = fileInfo.get('statusMonitor')
- if statusMonitor and statusMonitor.get('status') == dmProcessingStatus.DM_PROCESSING_STATUS_ABORTING:
+ statusMonitorId = ''
+ 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)
statusMonitor.updateStatus()
return
- self.logger.debug('Starting to process file %s' % filePath)
+ if statusMonitor:
+ statusMonitorId = statusMonitor.get('id', '')
+ self.logger.debug('Starting to process file %s (upload or DAQ id: %s)' % (filePath, statusMonitorId))
startProcessingTime = fileInfo.get('startProcessingTime', time.time())
fileInfo['startProcessingTime'] = startProcessingTime
nProcessors = len(self.fileProcessorKeyList)
@@ -64,11 +67,13 @@ class FileProcessingThread(threading.Thread):
processedByDict[processorName] = True
self.logger.debug('%s processed file at path %s ' % (processorName, filePath))
if processorNumber == nProcessors:
- self.logger.debug('File %s processing is complete' % (filePath))
endProcessingTime = time.time()
+ self.logger.debug('File %s processing is complete (upload or DAQ id: %s)' % (filePath, statusMonitorId))
if statusMonitor:
statusMonitor.fileProcessed(filePath, endProcessingTime)
statusMonitor.updateStatus()
+ nProcessedFiles = statusMonitor.get('nProcessedFiles', 0)
+ self.logger.debug('Upload or DAQ id %s has processed %s files so far)' % (statusMonitorId, nProcessedFiles))
except Exception, ex:
self.logger.exception(ex)
processingError = '%s processing error: %s' % (processorName, str(ex))
--
GitLab