Skip to content
Snippets Groups Projects
Commit e87b0dff authored by Wainer Vandelli's avatar Wainer Vandelli
Browse files

Get rid of exception deprecation messages

parent d4487621
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
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