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 b4764f5f8379b9dc18b74fed1930b783ebf94959..3345e89871abe5b853c80bcc6bddc4ccb9bd7b63 100755 --- a/src/python/dm/daq_web_service/service/impl/fileSystemObserver.py +++ b/src/python/dm/daq_web_service/service/impl/fileSystemObserver.py @@ -53,7 +53,9 @@ class FileSystemObserver(threading.Thread,Singleton): configItems = cm.getConfigItems(FileSystemObserver.CONFIG_SECTION_NAME) self.logger.debug('Got config items: %s' % configItems) self.minFileProcessingDelayInSeconds = int(cm.getConfigOption(FileSystemObserver.CONFIG_SECTION_NAME, FileSystemObserver.MIN_FILE_PROCESSING_DELAY_IN_SECONDS_KEY)) - self.fileSystemTimeoutInSeconds = int(cm.getConfigOption(FileSystemObserver.CONFIG_SECTION_NAME, FileSystemObserver.FILE_SYSTEM_EVENT_TIMEOUT_IN_SECONDS_KEY)) + self.logger.debug('Minimum file processing delay: %s seconds' % self.minFileProcessingDelayInSeconds) + self.fileSystemEventTimeoutInSeconds = int(cm.getConfigOption(FileSystemObserver.CONFIG_SECTION_NAME, FileSystemObserver.FILE_SYSTEM_EVENT_TIMEOUT_IN_SECONDS_KEY)) + self.logger.debug('File system event timeout: %s seconds' % self.fileSystemEventTimeoutInSeconds) @ThreadingUtility.synchronize def startObservingPath(self, dataDirectory, experiment): @@ -121,7 +123,7 @@ class FileSystemObserver(threading.Thread,Singleton): self.processFile(filePath) except Exception, ex: self.logger.exception(ex) - self.eventFlag.wait(timeout=self.fileSystemTimeoutInSeconds) + self.eventFlag.wait(timeout=self.fileSystemEventTimeoutInSeconds) @ThreadingUtility.synchronize def stop(self):