From f638b9f147cd01cacc9bff1ca845476392fb9914 Mon Sep 17 00:00:00 2001
From: "Arthur T. Glowacki" <aglowacki@aps.anl.gov>
Date: Thu, 1 Oct 2015 17:12:36 +0000
Subject: [PATCH] Added exception catching for directory events. This is
intended to fix a possible crash of watchdog and never seeing file changes
---
.../service/impl/dmFileSystemEventHandler.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
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 8cf16c85..a5ece2de 100755
--- a/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py
+++ b/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py
@@ -38,9 +38,12 @@ class DmFileSystemEventHandler(FileSystemEventHandler):
def on_modified(self, event):
FileSystemEventHandler.on_modified(self, event)
if event.is_directory:
- filePath = max(glob.glob(event.src_path+'*.*'), key=os.path.getctime)
- self.logger.debug('File system directory modified event: %s , latest file: %s' % (event.__dict__, filePath))
- self.fileSystemObserver.fileUpdated(filePath, self.dataDirectory, self.experiment)
+ try:
+ filePath = max(glob.glob(event.src_path+'*.*'), key=os.path.getctime)
+ self.logger.debug('File system directory modified event: %s , latest file: %s' % (event.__dict__, filePath))
+ self.fileSystemObserver.fileUpdated(filePath, self.dataDirectory, self.experiment)
+ except:
+ self.logger.debug('Exception occured when searching for file in directory: %s' % (event.__dict__))
else:
filePath = event.src_path
self.logger.debug('File system modified event: %s' % (event.__dict__))
--
GitLab