From 23ecb4f95650c5bcf822a06e82fb7802f0540e42 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 27 Jun 2011 16:31:28 +0200 Subject: [PATCH] [IMP] netsvc: even uglier logging code. bzr revid: vmt@openerp.com-20110627143128-fkau44h1smozzl8i --- openerp/netsvc.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openerp/netsvc.py b/openerp/netsvc.py index fbc1ed8498f..a4190336941 100644 --- a/openerp/netsvc.py +++ b/openerp/netsvc.py @@ -431,15 +431,19 @@ class OpenERPDispatcher: log(title, msg, channel=channel, depth=depth, fn=fn) def dispatch(self, service_name, method, params): try: - logger = logging.getLogger('result') - self.log('service', tuple(replace_request_password(params)), depth=(None if logger.isEnabledFor(logging.DEBUG_RPC_ANSWER) else 1), fn='%s.%s'%(service_name,method)) auth = getattr(self, 'auth_provider', None) + logger = logging.getLogger('result') + start_time = end_time = 0 + if logger.isEnabledFor(logging.DEBUG_RPC_ANSWER): + self.log('service', tuple(replace_request_password(params)), depth=None, fn='%s.%s'%(service_name,method)) if logger.isEnabledFor(logging.DEBUG_RPC): start_time = time.time() result = ExportService.getService(service_name).dispatch(method, auth, params) if logger.isEnabledFor(logging.DEBUG_RPC): end_time = time.time() - self.log('execution time', tuple(replace_request_password(params)), depth=1, fn='%.3fs '%(end_time - start_time)) + if not logger.isEnabledFor(logging.DEBUG_RPC_ANSWER): + self.log('service (%.3fs)' % (end_time - start_time), tuple(replace_request_password(params)), depth=1, fn='%s.%s'%(service_name,method)) + self.log('execution time', '%.3fs' % (end_time - start_time), channel=logging.DEBUG_RPC_ANSWER) self.log('result', result, channel=logging.DEBUG_RPC_ANSWER) return result except Exception, e: