diff --git a/Script/ManagerThread.py b/Script/ManagerThread.py
index b3ff2eac48118b9eb1afa72f5411e8b947733404..5ec1eda58ff4e9c84bc4345e3def3e3c377758a7 100644
--- a/Script/ManagerThread.py
+++ b/Script/ManagerThread.py
@@ -101,9 +101,9 @@ class ManagerThread(threading.Thread):
self.CopyFileList.append(DataFile)
self.DeleteQueue.put([DataFile,CastorPool,CastorDir,StageHost])
- self.logger.debug('File: '+ DataFile + ' in DeleteQueue')
+ self.logger.debug('File: %s in DeleteQueue', DataFile)
- self.logger.info('Size of DeleteQueue: ' + str(self.DeleteQueue.qsize()))
+ self.logger.info('Size of DeleteQueue: %d', self.DeleteQueue.qsize())
# Get the initial sorted list of files to be copied
# CopyFileList is a list of (.TOBECOPIED filename, Pool, Castor Directory,StageHost)
@@ -114,15 +114,15 @@ class ManagerThread(threading.Thread):
# order is important here: first CopyFileList then send to CopyThread
self.CopyFileList.append(element[0])
self.CopyQueue.put(element)
- self.logger.debug('File: ' + element[0] + ' in CopyQueue')
+ self.logger.debug('File: %s in CopyQueue', element[0])
- self.logger.info('Size of CopyQueue: ' + str(self.CopyQueue.qsize()))
+ self.logger.info('Size of CopyQueue: %d', self.CopyQueue.qsize())
def loop(self):
while not self.exitFlag:
self.event.wait(self.ManagerTimeout)
- self.logger.info('Clear processed files. Size of ClearQueue: ' + str(self.ClearQueue.qsize()))
+ self.logger.info('Clear processed files. Size of ClearQueue: %d', self.ClearQueue.qsize())
clearCounter = 0
@@ -130,7 +130,7 @@ class ManagerThread(threading.Thread):
if self.exitFlag: break
if self.ClearQueue.qsize() == 0: break
- self.logger.debug('clearCounter = ' + str(clearCounter) + '; nDel = ' + str(self.nDel))
+ self.logger.debug('clearCounter = %d; nDel = %d', clearCounter, self.nDel)
# Get file to be cleared from ClearQueue
clearfile = self.ClearQueue.get(0)
@@ -140,12 +140,12 @@ class ManagerThread(threading.Thread):
if not glob.glob(clearfile[0] + Constants.problematic_ext):
self.ProblDict.pop(clearfile[0], None)
- self.logger.debug('File: ' + clearfile[0] + ' removed from CopyFileList')
+ self.logger.debug('File: %s removed from CopyFileList', clearfile[0])
# Count the deleted files
clearCounter += 1
- self.logger.info('Size of ClearQueue: ' + str(self.ClearQueue.qsize()))
+ self.logger.info('Size of ClearQueue: %d', self.ClearQueue.qsize())
# After deletion of nDel files, update the list of files to be copied and the copy queue
self.logger.info('Update the list of files to be copied')
@@ -153,9 +153,9 @@ class ManagerThread(threading.Thread):
for element in NewList:
self.CopyFileList.append(element[0])
self.CopyQueue.put(element)
- self.logger.debug('File: ' + element[0] + ' in CopyQueue')
+ self.logger.debug('File: %s in CopyQueue', element[0])
- self.logger.info('Size of CopyQueue: ' + str(self.CopyQueue.qsize()))
+ self.logger.info('Size of CopyQueue: %d', self.CopyQueue.qsize())
# Update current year and month for directory streaming
self.updateDates()
@@ -169,8 +169,8 @@ class ManagerThread(threading.Thread):
self.loop()
except IOError, e:
- self.logger.critical('Cannot write Castor Info to %s because: "%s". ManagerThread is stopping!',
- e.filename, e.strerror)
+ self.logger.critical('Cannot write Castor Info to %s because: "%s". '
+ 'ManagerThread is stopping!', e.filename, e.strerror)
self.logger.info('ManagerThread exited')
@@ -182,7 +182,7 @@ class ManagerThread(threading.Thread):
for folder in self.DirList:
# Consider only unlocked filesystems
if glob.glob(os.path.join(folder,self.lockFile)):
- self.logger.debug('Filesystem "' + folder + '" is locked: do not copy files from there')
+ self.logger.debug('Directory "%s" is locked: do not copy files from there', folder)
continue
files = sum([glob.glob(os.path.join(folder,p)) for p in self.DataFilePattern],[])
@@ -199,7 +199,7 @@ class ManagerThread(threading.Thread):
# Do not take already listed files
if not filename in self.CopyFileList:
- self.logger.debug('New file: ' + filename)
+ self.logger.debug('New file: %s', filename)
# Check for minimal file size, if needed
if self.MinSizekB:
@@ -247,7 +247,7 @@ class ManagerThread(threading.Thread):
date_file_list.append((timestamp, filename, express, Pool, CopyDir, StageHost))
else:
- self.logger.debug('File ' + filename + ' already in the internal copy list')
+ self.logger.debug('File %s already in the internal copy list', filename)
self.logger.debug('Sort new files, with priority to express streams, then to oldest ones')
date_file_list.sort(self.Compare)
@@ -268,7 +268,7 @@ class ManagerThread(threading.Thread):
# ProblDict is a dictionary of {.PROBLEMATIC file : [timestamp,nretry]}
def checkProbl(self,ProblFile):
- self.logger.debug('Problematic file: ' + ProblFile + '. Check if it is time to retry the copying')
+ self.logger.debug('Problematic file: %s. Check if it is time to retry the copying', ProblFile)
if ProblFile not in self.ProblDict:
self.ProblDict[ProblFile] = [time(),0]
self.logger.debug('First time: retry')
@@ -285,14 +285,14 @@ class ManagerThread(threading.Thread):
self.ProblDelay*math.exp(self.ProblScalingFactor*nretry) :
nretry += 1
self.ProblDict[ProblFile] = [time(), nretry]
- self.logger.debug('Time to retry (' + str(nretry) + ' times up to now)')
+ self.logger.debug('Time to retry (%d times up to now)', nretry)
# Inform the user if we cannot copy the file and the retry time
# limit has been reached
if self.ProblDelay*math.exp(self.ProblScalingFactor*nretry) > \
self.ProblDelayLimit:
- self.logger.critical('Problematic file %s reached the delay retry limit of %d seconds. Please have a look!',
- ProblFile, self.ProblDelayLimit)
+ self.logger.critical('Problematic file %s reached the delay retry limit of %d seconds. '
+ 'Please have a look!', ProblFile, self.ProblDelayLimit)
return True
else:
self.logger.debug('Last retry was too recent: retry later')
@@ -311,7 +311,7 @@ class ManagerThread(threading.Thread):
elif glob.glob(filename + Constants.copied_ext): infoFile = filename + Constants.copied_ext
if infoFile:
- self.logger.debug('File: ' + filename + ' from previous run. Read Castor Info from ' + infoFile)
+ self.logger.debug('File: %s from previous run. Read Castor Info from %s', filename, infoFile)
InfoFile = open(infoFile,'r')
allLines = InfoFile.readlines()
InfoFile.close()
@@ -322,7 +322,7 @@ class ManagerThread(threading.Thread):
# EOS does not require a pool
pool = ''
stagehost = [x for x in allLines if 'StageHost' in x][0].split()[2]
- self.logger.debug('Castor Info: pool = ' + pool + ', copy directory = ' + CastorDir + ', stage host = ' + stagehost)
+ self.logger.debug('Castor Info: pool = %s, copy directory = %s, stage host = %s', pool, CastorDir, stagehost)
if not infoFile.endswith(Constants.copied_ext): os.rename(infoFile,filename + Constants.tobecopied_ext)
return [pool,CastorDir,stagehost]
@@ -353,7 +353,7 @@ class ManagerThread(threading.Thread):
# For new files, read CopyDir and CastorEnv from the configuration and
# write in .TOBECOPIED file
- self.logger.debug('New file: ' + filename + '. Read Castor Info from Configuration')
+ self.logger.debug('New file: %s. Read Castor Info from Configuration', filename)
# Stream driven case
def match_pool(drivenPool, parsed):
@@ -371,7 +371,7 @@ class ManagerThread(threading.Thread):
CastorDir = os.path.normpath(e.targetdir%dirdict)
pool = e.pool
stagehost = e.stagehost
- self.logger.debug('Castor Info: pool = ' + pool + ', copy directory = ' + CastorDir + ', stage host = ' + stagehost)
+ self.logger.debug('Castor Info: pool = %s, copy directory = %s, stage host = %s', pool, CastorDir, stagehost)
self.writeCastorInfo(filename,pool,CastorDir,stagehost)
return [pool,CastorDir,stagehost]
@@ -381,15 +381,14 @@ class ManagerThread(threading.Thread):
stagehost = self.StageHost
CastorDir = os.path.normpath(self.CopyDir%dirdict)
- self.logger.debug('Castor Info: pool = ' + pool + ', copy directory = ' + CastorDir + ', stage host = ' + stagehost)
-
+ self.logger.debug('Castor Info: pool = %s, copy directory = %s, stage host = %s', pool, CastorDir, stagehost)
self.writeCastorInfo(filename,pool,CastorDir,stagehost)
return [pool,CastorDir,stagehost]
# Write Castor copy directory and environment to .TOBECOPIED file
def writeCastorInfo(self,filename,Pool,CopyDir,stagehost):
- self.logger.debug('Write Castor Info to ' + filename + Constants.tobecopied_ext)
+ self.logger.debug('Write Castor Info to %s%s', filename, Constants.tobecopied_ext)
FileName = 'FileName = ' + filename + '\n'
CastorPool = 'CastorPool = ' + Pool + '\n'
CastorDir = 'CastorDir = ' + CopyDir + '\n'
diff --git a/Test/readme b/Test/readme
index 4eaf08a0d64870cfc3f7886cb6e4b0211cd90f00..27d562b9515f7c33cad5cd9187a0bcb353d1ee61 100644
--- a/Test/readme
+++ b/Test/readme
@@ -5,7 +5,7 @@ To run pylint as in gitlab CI:
cd /path/to/src/CastorScript
source /cvmfs/sft.cern.ch/lcg/views/LCG_87/x86_64-slc6-gcc62-opt/setup.sh
source /afs/cern.ch/atlas/project/tdaq/cmake/cmake_tdaq/bin/cm_setup.sh tdaq-07-01-00 x86_64-slc6-gcc62-opt
- export PYTHONPATH=/path/to/src/CastorScript/mailinglogger:"$PYTHONPATH"
+ export PYTHONPATH=./mailinglogger:"$PYTHONPATH"
pylint $(find Script -name '*.py' -a -not -name config.py)
Point 1 Tests