From 1e72694a03cf174b90d958418a44df8dd2a57345 Mon Sep 17 00:00:00 2001
From: Wainer Vandelli <Wainer.Vandelli@cern.ch>
Date: Thu, 6 Dec 2012 11:49:20 +0000
Subject: [PATCH] Make script less verbose when DB is not used
---
Script/CastorScript.py | 8 ++++----
Script/CopyThread.py | 4 ++--
Script/DeleteThread.py | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Script/CastorScript.py b/Script/CastorScript.py
index 25dffeb..2b06dc9 100755
--- a/Script/CastorScript.py
+++ b/Script/CastorScript.py
@@ -181,7 +181,7 @@ def main(conf):
signal.signal(signal.SIGINT, Exit)
##### Set Oracle Metadata Database connection #####
- db = 0
+ db = None
logger.info('Check for connection to Metadata Database')
db = checkDB(db,logger,dblogger,parser)
lastdbconn = time();
@@ -221,7 +221,7 @@ def main(conf):
except (Exception),ex:
logger.error(str(ex))
logger.warning('Could not connect to Metadata Database:')
- db = 0
+ db = None
dbLock.release()
lastdbconn = time()
@@ -298,7 +298,7 @@ def Exit(signum,frame):
def checkDB(db,logger,dblogger,parser):
dbFlag = copy.getDBFlag() and delete.getDBFlag()
- if not dbFlag: db = 0
+ if not dbFlag: db = None
if not db and conf.connection:
logger.info('No connection to Metadata Database at the moment: try to create one')
try:
@@ -306,7 +306,7 @@ def checkDB(db,logger,dblogger,parser):
logger.info('New connection to Metadata Database created')
except (Exception),ex:
logger.error(str(ex))
- logger.warning('Could not connect to Metadata Database')
+ logger.error('Could not connect to Metadata Database')
# end try, except
copy.setDB(db)
diff --git a/Script/CopyThread.py b/Script/CopyThread.py
index 856f113..acdd73d 100755
--- a/Script/CopyThread.py
+++ b/Script/CopyThread.py
@@ -264,8 +264,8 @@ class CopyThread(threading.Thread):
self.dbFlag = self.db.Transfer(DataFile, \
CastorFile, pool)
self.dbLock.release()
- else:
- self.logger.warning('No connection to Metadata database: database will not be updated')
+ elif self.conf.connection:
+ self.logger.warning('No connection to Metadata database: database will not be updated for file %s' % DataFile)
# end if,else
##### Copy successfull: rename .data.COPYING in .data.COPIED #####
os.rename(DataFile + copying_ext,
diff --git a/Script/DeleteThread.py b/Script/DeleteThread.py
index fc0bf5c..8878e95 100755
--- a/Script/DeleteThread.py
+++ b/Script/DeleteThread.py
@@ -96,8 +96,8 @@ class DeleteThread(threading.Thread):
self.dbLock.acquire()
self.dbFlag = self.db.Deletion(file)
self.dbLock.release()
- else:
- self.logger.warning('No connection to Metadata database: database will not be updated')
+ elif self.conf.connection:
+ self.logger.warning('No connection to Metadata database: database will not be updated for file %s' % file)
# end if,else
##### Put .data deleted file in the clear queue #####
--
GitLab