diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt
index 4c554bb6c16a3605629c69844560f56866c14fa2..48012ef0a9a0fef3c8ef0f2c0b531091dd8337cf 100644
--- a/doc/RELEASE_NOTES.txt
+++ b/doc/RELEASE_NOTES.txt
@@ -2,6 +2,8 @@ Release 0.10 (03/11/2016)
=============================
- Added dm-list-daqs and dm-list-uploads commands
+- Resolved issue with newly created directories treated as files for
+ real-time data acquisitions
Release 0.9 (02/25/2016)
=============================
diff --git a/etc/dm.deploy.conf b/etc/dm.deploy.conf
index 61ae06b539dfec5bc74660a2fa56b967824c7e36..87864bc8b70e7334ce4d7fc989da57eb8d3d7878 100644
--- a/etc/dm.deploy.conf
+++ b/etc/dm.deploy.conf
@@ -15,5 +15,5 @@ DM_DAQ_WEB_SERVICE_HOST=DM_HOSTNAME
DM_DAQ_WEB_SERVICE_PORT=33336
DM_CAT_WEB_SERVICE_HOST=DM_HOSTNAME
DM_CAT_WEB_SERVICE_PORT=44436
-DM_SOFTWARE_VERSION="0.9 (DM_DATE)"
+DM_SOFTWARE_VERSION="0.10 (DM_DATE)"
diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py
index b4f063c8fd4710d512cb641b1b9633a0d390b524..d3ba006f6a784753d4e64bb3a324ac922c807778 100644
--- a/src/python/dm/__init__.py
+++ b/src/python/dm/__init__.py
@@ -1 +1 @@
-__version__ = "0.9 (2016.02.24)"
+__version__ = "0.10 (2016.03.21)"
diff --git a/src/python/dm/common/client/sessionManager.py b/src/python/dm/common/client/sessionManager.py
index 63811af1b1c672bfeb89e5ff38f7e9a33d00c1f1..2e2dbc69f4b6ecb722c0657275247268134358a6 100755
--- a/src/python/dm/common/client/sessionManager.py
+++ b/src/python/dm/common/client/sessionManager.py
@@ -159,7 +159,7 @@ class SessionManager:
parsedUrl = urlparse.urlparse(url)
protocol = parsedUrl[0]
path = parsedUrl[2]
- self.logger.debug('Sending request: %s' % url)
+ #self.logger.debug('Sending request: %s' % url)
encodedData = ''
if data is not None:
if type(data) == types.DictType and len(data):
diff --git a/src/python/dm/common/processing/plugins/mongoDbFileCatalogPlugin.py b/src/python/dm/common/processing/plugins/mongoDbFileCatalogPlugin.py
index eb3e8e4e385763aaadd38c3774dd55308b8b728c..38bd600044472a4e6b8f2a4d942f4a3683cb26b0 100755
--- a/src/python/dm/common/processing/plugins/mongoDbFileCatalogPlugin.py
+++ b/src/python/dm/common/processing/plugins/mongoDbFileCatalogPlugin.py
@@ -18,7 +18,7 @@ class MongoDbFileCatalogPlugin(FileProcessor):
def processFile(self, fileInfo):
experimentFilePath = fileInfo.get('experimentFilePath')
experimentName = fileInfo.get('experimentName')
- self.logger.debug('Processing file "%s" for experiment %s: %s' % (experimentFilePath, experimentName, fileInfo))
+ self.logger.debug('Processing file "%s" for experiment %s' % (experimentFilePath, experimentName))
daqInfo = fileInfo.get('daqInfo')
storageDirectory = daqInfo.get('storageDirectory')
diff --git a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py
index 937fe1e572f0c2e012048c59c3517605d5f5e7af..4c0bac6c123ee335b944567f4ac401144defbb9d 100755
--- a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py
@@ -64,7 +64,7 @@ class RsyncFileTransferPlugin(FileTransferPlugin):
FileUtility.getMd5Sum(filePath, fileInfo)
# Transfer file
- self.logger.debug('Starting transfer: %s' % fileInfo)
+ self.logger.debug('Starting transfer: %s -> %s' % (srcUrl, destUrl))
self.start(src=srcUrl, dest=destUrl, templateInfo=fileInfo, cwd=dataDirectory)
# Get remote checksum
diff --git a/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py b/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py
index f0dfa13b1cc39c1616c85c3e9bd13ab5d838de85..973efd4f34978d1653a993586856c6de7998cdd8 100755
--- a/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py
+++ b/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py
@@ -46,9 +46,13 @@ class DmFileSystemEventHandler(FileSystemEventHandler):
files = glob.glob(os.path.join(event.src_path,'*'))
self.logger.debug('Processing directory event: %s , src path: %s' % (event.__dict__, event.src_path))
if len(files) > 0:
- filePath = max(files, key=os.path.getctime)
- self.logger.debug('Latest file: %s' % (filePath))
- self.fileSystemObserver.fileUpdated(filePath, self.dataDirectory, self.experiment)
+ sortedFiles = sorted(files, key=os.path.getctime, reverse=True)
+ for filePath in sortedFiles:
+ if os.path.isfile(filePath):
+ self.logger.debug('Latest file: %s' % (filePath))
+ self.fileSystemObserver.fileUpdated(filePath, self.dataDirectory, self.experiment)
+ return
+ self.logger.debug('No new files found in %s' % (event.src_path))
except Exception, ex:
self.logger.error('Exception occured when searching for file in directory %s: %s' % (event.__dict__, ex))
else:
diff --git a/src/python/dm/daq_web_service/service/impl/dsProcessFileNotificationPlugin.py b/src/python/dm/daq_web_service/service/impl/dsProcessFileNotificationPlugin.py
index 68cf9d02fdad25c075f6133b091ff14a5bead522..d76a617b97c9d03b0e5633577ba2dd3aff7b572e 100755
--- a/src/python/dm/daq_web_service/service/impl/dsProcessFileNotificationPlugin.py
+++ b/src/python/dm/daq_web_service/service/impl/dsProcessFileNotificationPlugin.py
@@ -18,7 +18,7 @@ class DsProcessFileNotificationPlugin(FileProcessor):
experimentName = fileInfo.get('experimentName')
daqInfo = fileInfo.get('daqInfo', {})
md5Sum = fileInfo.get('md5Sum')
- self.logger.debug('Processing file %s for experiment %s: %s' % (experimentFilePath, experimentName, str(fileInfo)))
+ self.logger.debug('Processing file %s for experiment %s' % (experimentFilePath, experimentName))
# Prepare dictionary for processing. Only send needed data.
fileInfo2 = {}
diff --git a/src/python/dm/daq_web_service/service/impl/fileSystemObserver.py b/src/python/dm/daq_web_service/service/impl/fileSystemObserver.py
index 1d907ce9a67992e6d2e3c0f2e5cfa8e4cbbe59cf..b3900e5a86bffc8283fdde17b61a1b5befe4394b 100755
--- a/src/python/dm/daq_web_service/service/impl/fileSystemObserver.py
+++ b/src/python/dm/daq_web_service/service/impl/fileSystemObserver.py
@@ -110,7 +110,7 @@ class FileSystemObserver(threading.Thread,Singleton):
observedFile['statusMonitor'] = daqInfo
observedFile.setLastUpdateTimeToNow()
self.observedFileMap[filePath] = observedFile
- self.logger.debug('Observed file updated: %s', observedFile)
+ self.logger.debug('Observed file updated: %s', filePath)
@ThreadingUtility.synchronize
def checkObservedFilesForProcessing(self):