From b44ce713324c0ad69d92bfdd0e6e0e51b1d1010b Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 9 Dec 2015 04:54:46 +0000
Subject: [PATCH] minor fixes after deployment
---
doc/RELEASE_NOTES.txt | 2 +-
src/python/dm/__init__.py | 2 +-
.../rsyncWithChecksumAndDeleteFileTransferPlugin.py | 9 ++++-----
.../service/impl/dmFileSystemEventHandler.py | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt
index 90d7d0d7..3c4718a4 100644
--- a/doc/RELEASE_NOTES.txt
+++ b/doc/RELEASE_NOTES.txt
@@ -1,4 +1,4 @@
-Release 0.7 ()
+Release 0.7 (12/08/2015)
=============================
- Introduced framework and user interfaces for tracking progress of file
diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py
index 85013a64..7d57f85f 100644
--- a/src/python/dm/__init__.py
+++ b/src/python/dm/__init__.py
@@ -1 +1 @@
-__version__ = "0.6 (2015.11.09)"
+__version__ = "0.7 (2015.12.08)"
diff --git a/src/python/dm/common/processing/plugins/rsyncWithChecksumAndDeleteFileTransferPlugin.py b/src/python/dm/common/processing/plugins/rsyncWithChecksumAndDeleteFileTransferPlugin.py
index f397d566..87a5125e 100755
--- a/src/python/dm/common/processing/plugins/rsyncWithChecksumAndDeleteFileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/rsyncWithChecksumAndDeleteFileTransferPlugin.py
@@ -20,11 +20,10 @@ class RsyncWithChecksumAndDeleteFileTransferPlugin(FileTransferPlugin):
def processFile(self, fileInfo):
filePath = fileInfo.get('filePath')
dataDirectory = fileInfo.get('dataDirectory')
- experiment = fileInfo.get('experiment')
- experimentName = experiment.get('name')
- experimentFilePath = fileInfo.get('experimentFilePath')
- storageHost = experiment.get('storageHost')
- storageDirectory = experiment.get('storageDirectory')
+ experimentFilePath = fileInfo.get('experimentFilePath')
+ experimentName = fileInfo.get('experimentName')
+ storageHost = fileInfo.get('storageHost')
+ storageDirectory = fileInfo.get('storageDirectory')
destUrl = self.getDestUrl(filePath, dataDirectory, storageHost, storageDirectory)
# Use relative path with respect to data directory as a source
os.chdir(dataDirectory)
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 7cc20a76..dc9f033a 100755
--- a/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py
+++ b/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py
@@ -42,9 +42,9 @@ class DmFileSystemEventHandler(FileSystemEventHandler):
def processEvent(self, event):
if event.is_directory:
- self.logger.debug('Processing directory event: %s , src path: %s , latest files: %s' % (event.__dict__, event.src_path, files))
try:
files = glob.glob(os.path.join(event.src_path,'*.*'))
+ self.logger.debug('Processing directory event: %s , src path: %s , latest files: %s' % (event.__dict__, event.src_path, files))
if len(files) > 0:
filePath = max(files, key=os.path.getctime)
self.logger.debug('Latest file: %s' % (filePath))
--
GitLab