From f52bf34c300e64a732224cf629c2528734f93590 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 9 Dec 2015 06:07:22 +0000
Subject: [PATCH] fix stat bug
---
src/python/dm/common/utility/ftpUtility.py | 4 ++--
.../service/impl/experimentSessionControllerImpl.py | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/python/dm/common/utility/ftpUtility.py b/src/python/dm/common/utility/ftpUtility.py
index ab6f0314..8a75aed4 100755
--- a/src/python/dm/common/utility/ftpUtility.py
+++ b/src/python/dm/common/utility/ftpUtility.py
@@ -82,6 +82,6 @@ class FtpUtility:
# Testing.
if __name__ == '__main__':
- ftpUtility = FtpUtility('zagreb', 2811)
- files=ftpUtility.getFiles('/tmp/test')
+ ftpUtility = FtpUtility('s8dserv', 2811)
+ files=ftpUtility.getFiles('/export/8-id-i/test')
print files
diff --git a/src/python/dm/daq_web_service/service/impl/experimentSessionControllerImpl.py b/src/python/dm/daq_web_service/service/impl/experimentSessionControllerImpl.py
index c047191b..07085c6d 100755
--- a/src/python/dm/daq_web_service/service/impl/experimentSessionControllerImpl.py
+++ b/src/python/dm/daq_web_service/service/impl/experimentSessionControllerImpl.py
@@ -86,7 +86,12 @@ class ExperimentSessionControllerImpl(DmObjectManager):
fileInfo['daqInfo'] = daqInfo
fileInfo['uploadId'] = uploadId
fileUploadInfo = { 'processed' : False }
- FileUtility.statFile(filePath, fileUploadInfo)
+ # Stat should be done by agent, not by observer.
+ try:
+ FileUtility.statFile(filePath, fileUploadInfo)
+ except:
+ # Ok, may be remote file
+ pass
fileDict[filePath] = fileUploadInfo
fileProcessingManager.processFile(fileInfo)
uploadInfo['fileDict'] = fileDict
--
GitLab