[REF] additional cleanup after vmt's logging refactoring.
bzr revid: florent.xicluna@gmail.com-20120208142248-p63odfqo673yqqml
This commit is contained in:
parent
d8b25ca182
commit
1ef81548ba
|
@ -131,7 +131,7 @@ class TinySocketServerThread(threading.Thread,netsvc.Server):
|
||||||
_logger.debug("Netrpc: %d threads", len(self.threads))
|
_logger.debug("Netrpc: %d threads", len(self.threads))
|
||||||
self.socket.close()
|
self.socket.close()
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
_logger.warning("Netrpc: closing because of exception %s" % str(e))
|
_logger.warning("Netrpc: closing because of exception %s", e)
|
||||||
self.socket.close()
|
self.socket.close()
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
|
@ -224,9 +224,9 @@ class db(netsvc.ExportService):
|
||||||
|
|
||||||
if not data or res:
|
if not data or res:
|
||||||
_logger.error(
|
_logger.error(
|
||||||
'DUMP DB: %s failed! Please verify the configuration of the database password on the server. '\
|
'DUMP DB: %s failed! Please verify the configuration of the database password on the server. '
|
||||||
'It should be provided as a -w <PASSWD> command-line option, or as `db_password` in the '\
|
'It should be provided as a -w <PASSWD> command-line option, or as `db_password` in the '
|
||||||
'server configuration file.\n %s' % (db_name, data))
|
'server configuration file.\n %s', db_name, data)
|
||||||
raise Exception, "Couldn't dump database"
|
raise Exception, "Couldn't dump database"
|
||||||
_logger.info('DUMP DB successful: %s', db_name)
|
_logger.info('DUMP DB successful: %s', db_name)
|
||||||
|
|
||||||
|
@ -239,7 +239,7 @@ class db(netsvc.ExportService):
|
||||||
self._set_pg_psw_env_var()
|
self._set_pg_psw_env_var()
|
||||||
|
|
||||||
if self.exp_db_exist(db_name):
|
if self.exp_db_exist(db_name):
|
||||||
_logger.warning('RESTORE DB: %s already exists' % (db_name,))
|
_logger.warning('RESTORE DB: %s already exists', db_name)
|
||||||
raise Exception, "Database already exists"
|
raise Exception, "Database already exists"
|
||||||
|
|
||||||
self._create_empty_database(db_name)
|
self._create_empty_database(db_name)
|
||||||
|
@ -268,7 +268,7 @@ class db(netsvc.ExportService):
|
||||||
res = stdout.close()
|
res = stdout.close()
|
||||||
if res:
|
if res:
|
||||||
raise Exception, "Couldn't restore database"
|
raise Exception, "Couldn't restore database"
|
||||||
_logger.info('RESTORE DB: %s' % (db_name))
|
_logger.info('RESTORE DB: %s', db_name)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
finally:
|
finally:
|
||||||
|
@ -451,8 +451,7 @@ GNU Public Licence.
|
||||||
|
|
||||||
backup_directory = os.path.join(tools.config['root_path'], 'backup', time.strftime('%Y-%m-%d-%H-%M'))
|
backup_directory = os.path.join(tools.config['root_path'], 'backup', time.strftime('%Y-%m-%d-%H-%M'))
|
||||||
if zips and not os.path.isdir(backup_directory):
|
if zips and not os.path.isdir(backup_directory):
|
||||||
_logger.info('create a new backup directory to \
|
_logger.info('create a new backup directory to store the old modules: %s', backup_directory)
|
||||||
store the old modules: %s', backup_directory)
|
|
||||||
os.makedirs(backup_directory)
|
os.makedirs(backup_directory)
|
||||||
|
|
||||||
for module in zips:
|
for module in zips:
|
||||||
|
@ -678,7 +677,7 @@ class report_spool(netsvc.ExportService):
|
||||||
self._reports[id]['state'] = True
|
self._reports[id]['state'] = True
|
||||||
except Exception, exception:
|
except Exception, exception:
|
||||||
|
|
||||||
_logger.exception('Exception: %s\n', str(exception))
|
_logger.exception('Exception: %s\n', exception)
|
||||||
if hasattr(exception, 'name') and hasattr(exception, 'value'):
|
if hasattr(exception, 'name') and hasattr(exception, 'value'):
|
||||||
self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
|
self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
|
||||||
else:
|
else:
|
||||||
|
@ -715,7 +714,7 @@ class report_spool(netsvc.ExportService):
|
||||||
self._reports[id]['format'] = format
|
self._reports[id]['format'] = format
|
||||||
self._reports[id]['state'] = True
|
self._reports[id]['state'] = True
|
||||||
except Exception, exception:
|
except Exception, exception:
|
||||||
_logger.exception('Exception: %s\n', str(exception))
|
_logger.exception('Exception: %s\n', exception)
|
||||||
if hasattr(exception, 'name') and hasattr(exception, 'value'):
|
if hasattr(exception, 'name') and hasattr(exception, 'value'):
|
||||||
self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
|
self._reports[id]['exception'] = openerp.exceptions.DeferredException(tools.ustr(exception.name), tools.ustr(exception.value))
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -31,7 +31,6 @@ import openerp.pooler as pooler
|
||||||
|
|
||||||
from openerp.osv.osv import except_osv
|
from openerp.osv.osv import except_osv
|
||||||
from openerp.osv.orm import except_orm
|
from openerp.osv.orm import except_orm
|
||||||
import sys
|
|
||||||
|
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -168,10 +167,7 @@ class interface(netsvc.Service):
|
||||||
or isinstance(e, except_orm):
|
or isinstance(e, except_orm):
|
||||||
netsvc.abort_response(2, e.name, 'warning', e.value)
|
netsvc.abort_response(2, e.name, 'warning', e.value)
|
||||||
else:
|
else:
|
||||||
import traceback
|
_logger.exception('Exception in call:')
|
||||||
tb_s = reduce(lambda x, y: x+y, traceback.format_exception(
|
|
||||||
sys.exc_type, sys.exc_value, sys.exc_traceback))
|
|
||||||
_logger.error('Exception in call: ' + tb_s)
|
|
||||||
raise
|
raise
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
Loading…
Reference in New Issue