From 050d369f4aec38f7c876bbd5f307f3085a647b71 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 22 Nov 2011 13:18:33 +0100 Subject: [PATCH] [IMP] better debugging output bzr revid: chs@openerp.com-20111122121833-okbmche6lhw78d4d --- addons/web/common/http.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index afad089f1d8..4d44f3175f8 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -165,6 +165,7 @@ class JsonRequest(WebRequest): requestf = self.httprequest.stream direct_json_request = None jsonp_callback = None + rid = None if requestf: direct_json_request = requestf.read() @@ -222,10 +223,12 @@ class JsonRequest(WebRequest): return werkzeug.exceptions.BadRequest() error = None + if not rid: + rid = self.jsonrequest.get('id') try: if _logger.isEnabledFor(logging.DEBUG): - _logger.debug("--> %s.%s\n%s", controller.__class__.__name__, method.__name__, pprint.pformat(self.jsonrequest)) - response['id'] = self.jsonrequest.get('id') + _logger.debug("[%s] --> %s.%s\n%s", rid, controller.__class__.__name__, method.__name__, pprint.pformat(self.jsonrequest)) + response['id'] = rid response["result"] = method(controller, self, **self.params) except openerplib.AuthenticationError: error = { @@ -260,9 +263,10 @@ class JsonRequest(WebRequest): } if error: response["error"] = error + _logger.error("[%s] <--\n%s", rid, pprint.pformat(response)) - if _logger.isEnabledFor(logging.DEBUG): - _logger.debug("<--\n%s", pprint.pformat(response)) + elif _logger.isEnabledFor(logging.DEBUG): + _logger.debug("[%s] <--\n%s", rid, pprint.pformat(response)) return build_response(response)