From 78986ba9d21b89a9dd76fb0c7c6a4af6fd286018 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 21 Jun 2011 10:30:11 +0200 Subject: [PATCH] [REF] netsvc+ir_cron: removed unnecessary getLogger, removed double call to f/dispatch. bzr revid: vmt@openerp.com-20110621083011-53toyp3lsa4rxs39 --- openerp/addons/base/ir/ir_cron.py | 5 ++--- openerp/netsvc.py | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/openerp/addons/base/ir/ir_cron.py b/openerp/addons/base/ir/ir_cron.py index 373847d4c52..afaaebc8774 100644 --- a/openerp/addons/base/ir/ir_cron.py +++ b/openerp/addons/base/ir/ir_cron.py @@ -102,11 +102,10 @@ class ir_cron(osv.osv, netsvc.Agent): logger = logging.getLogger('execution time') if logger.isEnabledFor(logging.DEBUG_RPC): start_time = time.time() - f(cr, uid, *args) + f(cr, uid, *args) + if logger.isEnabledFor(logging.DEBUG_RPC): end_time = time.time() logger.log(logging.DEBUG_RPC, '%.3fs (%s, %s)' % (end_time - start_time, model, func)) - else: - f(cr, uid, *args) except Exception, e: self._handle_callback_exception(cr, uid, model, func, args, job_id, e) diff --git a/openerp/netsvc.py b/openerp/netsvc.py index 5e12b5c450d..fbc1ed8498f 100644 --- a/openerp/netsvc.py +++ b/openerp/netsvc.py @@ -436,12 +436,10 @@ class OpenERPDispatcher: auth = getattr(self, 'auth_provider', None) if logger.isEnabledFor(logging.DEBUG_RPC): start_time = time.time() - result = ExportService.getService(service_name).dispatch(method, auth, params) + result = ExportService.getService(service_name).dispatch(method, auth, params) + if logger.isEnabledFor(logging.DEBUG_RPC): end_time = time.time() - logger = logging.getLogger('execution time') self.log('execution time', tuple(replace_request_password(params)), depth=1, fn='%.3fs '%(end_time - start_time)) - else: - result = ExportService.getService(service_name).dispatch(method, auth, params) self.log('result', result, channel=logging.DEBUG_RPC_ANSWER) return result except Exception, e: