Skip to content
Snippets Groups Projects
Commit f228f7be authored by sveseli's avatar sveseli
Browse files

merge from 1.1

parents 220a4472 0befd799
No related branches found
No related tags found
No related merge requests found
......@@ -48,6 +48,7 @@ class FileSystemObserver(threading.Thread,Singleton):
self.observedFileMap = {}
self.__configure()
self.fileProcessingManager = FileProcessingManager.getInstance()
self.nProcessedFilesDict = {}
self.logger.debug('Initialization complete')
finally:
FileSystemObserver.__instanceLock.release()
......@@ -125,11 +126,14 @@ class FileSystemObserver(threading.Thread,Singleton):
# more files should be added for processing, so we need to
# update all daq infos before going over observed files
DaqTracker.getInstance().updateDaqInfos()
nWaitingFilesDict = {}
for (filePath,observedFile) in self.observedFileMap.items():
daqInfo = observedFile['daqInfo']
daqId = daqInfo['id']
nWaitingFiles = nWaitingFilesDict.get(daqId, daqInfo.get('nWaitingFiles', 0))
daqId = observedFile['daqInfo']['id']
daqInfo = DaqTracker.getInstance().getDaqInfo(daqId)
nProcessedFiles = self.nProcessedFilesDict.get(daqId, 0)
nCompletedFiles = daqInfo.get('nCompletedFiles', 0)
nWaitingFiles = nProcessedFiles - nCompletedFiles
if nWaitingFiles >= self.DAQ_CHUNK_SIZE_IN_FILES:
# We do not need to add more files for processing for this DAQ
#self.logger.debug('There are %s waiting files for DAQ id %s, will not add more for processing.' % (nWaitingFiles, daqInfo['id']))
......@@ -140,7 +144,7 @@ class FileSystemObserver(threading.Thread,Singleton):
if deltaT > self.minFileProcessingDelayInSeconds:
self.logger.debug('File %s was last modified %s seconds ago, will process it.' % (filePath, deltaT))
filePathsForProcessing.append(filePath)
nWaitingFilesDict[daqId] = nWaitingFiles+1
self.nProcessedFilesDict[daqId] = nProcessedFiles+1
return filePathsForProcessing
@ThreadingUtility.synchronize
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment