diff --git a/Script/CastorScript.py b/Script/CastorScript.py index 3dfabdb53b3a7da5093bb13a07a507be6a8d77c1..c3962c80acc970449f7a0b8f0284fec6ad164b9c 100755 --- a/Script/CastorScript.py +++ b/Script/CastorScript.py @@ -30,7 +30,6 @@ if len(sys.argv) >= 2: try: conf = Conf.Conf(sys.argv[1]) except (Exception), ex: - #ex_info = ex.message print 'Configuration file parsing failed because:', ex sys.exit(1); else: @@ -102,10 +101,9 @@ def main(conf): try: mod = __import__(conf.Filenameparser) except (Exception),ex: - message = ex.message logInfo = {'file':logger.findCaller()[0],'line':logger.findCaller()[1]} logger.error('Cannot import parser module '+conf.Filenameparser - + ' because: "' + ex.message + '". Giving up!' + + ' because: "' + str(ex) + '". Giving up!' ,extra = logInfo) return @@ -176,9 +174,8 @@ def main(conf): try: db.Reconnect() except (Exception),ex: - ex_info = ex.message logInfo = {'file':logger.findCaller()[0],'line':logger.findCaller()[1]} - logger.error(str(ex_info),extra = logInfo) + logger.error(str(ex),extra = logInfo) logger.warning('Could not connect to Metadata Database:',extra = logInfo) db = 0 @@ -257,9 +254,8 @@ def checkDB(db,logger,dblogger,parser): logInfo = {'file':logger.findCaller()[0],'line':logger.findCaller()[1]} logger.info('New connection to Metadata Database created',extra = logInfo) except (Exception),ex: - ex_info = ex.message logInfo = {'file':logger.findCaller()[0],'line':logger.findCaller()[1]} - logger.error(str(ex_info),extra = logInfo) + logger.error(str(ex),extra = logInfo) logger.warning('Could not connect to Metadata Database:',extra = logInfo) # end try, except diff --git a/Script/Database.py b/Script/Database.py index da87861712eb240993e6bf1af0fcc9bc13cfd9f7..d4bb83b83384e0c4845d8ac5ba040bd14dcba66c 100755 --- a/Script/Database.py +++ b/Script/Database.py @@ -78,8 +78,7 @@ class Database: self.db.execute(args,keys) result = self.db.getNextRow()[:3] except (cx_Oracle.InterfaceError,cx_Oracle.DatabaseError),ex: - ex_info = ex.message - self.logger.error(str(ex_info),extra = logInfo) + self.logger.error(str(ex),extra = logInfo) self.logger.error(str(self.db.lastOp()),extra = logInfo) self.logger.error(str(self.db.getLastKeys()),extra = logInfo) except: @@ -96,9 +95,8 @@ class Database: self.filedeletion(sfofile) return True except (cx_Oracle.InterfaceError,cx_Oracle.DatabaseError),ex: - ex_info = ex.message logInfo = {'file':self.logger.findCaller()[0],'line':self.logger.findCaller()[1]} - self.logger.error(str(ex_info),extra = logInfo) + self.logger.error(str(ex),extra = logInfo) self.logger.error(str(self.db.lastOp()),extra = logInfo) self.logger.error(str(self.db.getLastKeys()),extra = logInfo) return False @@ -118,7 +116,7 @@ class Database: try: self.filetransfer(sfofile, castorfile, svcclass) except (cx_Oracle.InterfaceError, cx_Oracle.DatabaseError),ex: - ex_info = str(ex.message) + ex_info = str(ex) logInfo = {'file':self.logger.findCaller()[0], 'line':self.logger.findCaller()[1]} self.logger.error(ex_info, extra = logInfo) @@ -151,10 +149,9 @@ class Database: return True except (cx_Oracle.InterfaceError, cx_Oracle.DatabaseError),ex: - ex_info = ex.message logInfo = {'file':self.logger.findCaller()[0], 'line':self.logger.findCaller()[1]} - self.logger.error(str(ex_info),extra = logInfo) + self.logger.error(str(ex),extra = logInfo) self.logger.error(str(self.db.lastOp()),extra = logInfo) self.logger.error(str(self.db.getLastKeys()),extra = logInfo) return False