From 1f9289a098afbec64e492d6ec2bd054f74c1d905 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 7 Sep 2011 14:37:03 +0200 Subject: [imp] improved server loggin bzr revid: nicolas.vanhoren@openerp.com-20110907123703-owcjsptzd4o3h3ww --- addons/web/common/dispatch.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'addons/web/common/dispatch.py') diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py index 0f2b7fd2293..571b5179a46 100644 --- a/addons/web/common/dispatch.py +++ b/addons/web/common/dispatch.py @@ -26,6 +26,11 @@ import backendrpc as backend __all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller', 'WebRequest', 'JsonRequest', 'HttpRequest'] +_logger = logging.getLogger(__name__) +if not _logger.handlers: + _logger.addHandler(logging.StreamHandler(sys.stdout)) + _logger.propagate = False + #----------------------------------------------------------- # Globals (wont move into a pool) #----------------------------------------------------------- @@ -159,8 +164,7 @@ class JsonRequest(WebRequest): else: self.jsonrequest = simplejson.loads(request, object_hook=nonliterals.non_literal_decoder) self.init(self.jsonrequest.get("params", {})) - if self.debug or 1: - print "--> %s.%s %s" % (controller.__class__.__name__, method.__name__, self.jsonrequest) + _logger.debug("--> %s.%s %s" % (controller.__class__.__name__, method.__name__, self.jsonrequest)) response['id'] = self.jsonrequest.get('id') response["result"] = method(controller, self, **self.params) except backend.OpenERPUnboundException: @@ -197,10 +201,7 @@ class JsonRequest(WebRequest): if error: response["error"] = error - if self.debug or 1: - print "<--", response - print - + _logger.debug("<-- %s" % response) content = simplejson.dumps(response, cls=nonliterals.NonLiteralEncoder) return werkzeug.wrappers.Response( content, headers=[('Content-Type', 'application/json'), @@ -237,15 +238,13 @@ class HttpRequest(WebRequest): akw[key] = value else: akw[key] = type(value) - if self.debug or 1: - print "%s --> %s.%s %r" % (self.httprequest.method, controller.__class__.__name__, method.__name__, akw) + _logger.debug("%s --> %s.%s %r" % (self.httprequest.method, controller.__class__.__name__, method.__name__, akw)) r = method(controller, self, **self.params) if self.debug or 1: if isinstance(r, werkzeug.wrappers.BaseResponse): - print '<--', r + _logger.debug('<-- %s' % r) else: - print "<--", 'size:', len(r) - print + _logger.debug("<-- size: %s" % len(r)) return r def make_response(self, data, headers=None, cookies=None): @@ -391,7 +390,7 @@ class Root(object): manifest_path = os.path.join(addons_path, module, '__openerp__.py') if os.path.isfile(manifest_path): manifest = ast.literal_eval(open(manifest_path).read()) - print "Loading", module + _logger.info("Loading %s", module) m = __import__(module) addons_module[module] = m addons_manifest[module] = manifest @@ -424,6 +423,6 @@ class Root(object): meth = rest[0] m = getattr(c, meth) if getattr(m, 'exposed', False): - print "Dispatching to", ps, c, meth, m + _logger.debug("Dispatching to %s %s %s %s", ps, c, meth, m) return m return None -- cgit v1.2.3 From 41dd08123341392bb48897f861f6a3a09293dfc4 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 7 Sep 2011 16:19:35 +0200 Subject: [IMP] move dispatch logger config to launcher script to avoid clobbering file-based or server-integrated logging config bzr revid: xmo@openerp.com-20110907141935-0tudrot0yc49ma4y --- addons/web/common/dispatch.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'addons/web/common/dispatch.py') diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py index 571b5179a46..e4d88713409 100644 --- a/addons/web/common/dispatch.py +++ b/addons/web/common/dispatch.py @@ -27,9 +27,6 @@ __all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller', 'WebRequest', 'JsonRequest', 'HttpRequest'] _logger = logging.getLogger(__name__) -if not _logger.handlers: - _logger.addHandler(logging.StreamHandler(sys.stdout)) - _logger.propagate = False #----------------------------------------------------------- # Globals (wont move into a pool) -- cgit v1.2.3 From 66e2cee0d55563ba8916990418e9cc12c36ac012 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 7 Sep 2011 16:21:20 +0200 Subject: [IMP] logging string formatting bzr revid: xmo@openerp.com-20110907142120-2bq0k6xxwkenpuqh --- addons/web/common/dispatch.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'addons/web/common/dispatch.py') diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py index e4d88713409..92808e7e475 100644 --- a/addons/web/common/dispatch.py +++ b/addons/web/common/dispatch.py @@ -161,7 +161,7 @@ class JsonRequest(WebRequest): else: self.jsonrequest = simplejson.loads(request, object_hook=nonliterals.non_literal_decoder) self.init(self.jsonrequest.get("params", {})) - _logger.debug("--> %s.%s %s" % (controller.__class__.__name__, method.__name__, self.jsonrequest)) + _logger.debug("--> %s.%s %s", controller.__class__.__name__, method.__name__, self.jsonrequest) response['id'] = self.jsonrequest.get('id') response["result"] = method(controller, self, **self.params) except backend.OpenERPUnboundException: @@ -198,7 +198,7 @@ class JsonRequest(WebRequest): if error: response["error"] = error - _logger.debug("<-- %s" % response) + _logger.debug("<-- %s", response) content = simplejson.dumps(response, cls=nonliterals.NonLiteralEncoder) return werkzeug.wrappers.Response( content, headers=[('Content-Type', 'application/json'), @@ -235,13 +235,13 @@ class HttpRequest(WebRequest): akw[key] = value else: akw[key] = type(value) - _logger.debug("%s --> %s.%s %r" % (self.httprequest.method, controller.__class__.__name__, method.__name__, akw)) + _logger.debug("%s --> %s.%s %r", self.httprequest.method, controller.__class__.__name__, method.__name__, akw) r = method(controller, self, **self.params) if self.debug or 1: if isinstance(r, werkzeug.wrappers.BaseResponse): - _logger.debug('<-- %s' % r) + _logger.debug('<-- %s', r) else: - _logger.debug("<-- size: %s" % len(r)) + _logger.debug("<-- size: %s", len(r)) return r def make_response(self, data, headers=None, cookies=None): -- cgit v1.2.3 From a2485c3c4c08e601b1dfa902da367a4c084557e4 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 7 Sep 2011 16:22:27 +0200 Subject: [FIX] name of all logger to exist at the correct place in the loggers hierarchy bzr revid: xmo@openerp.com-20110907142227-601yrbrzhcv1vq38 --- addons/web/common/dispatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/common/dispatch.py') diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py index 92808e7e475..a88c5b6289c 100644 --- a/addons/web/common/dispatch.py +++ b/addons/web/common/dispatch.py @@ -185,7 +185,7 @@ class JsonRequest(WebRequest): } } except Exception: - logging.getLogger('openerp.JSONRequest.dispatch').exception\ + logging.getLogger(__name__ + '.JSONRequest.dispatch').exception\ ("An error occured while handling a json request") error = { 'code': 300, -- cgit v1.2.3 From 43a788378df5ad3ba4e9a481b9249771d2b1068c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 7 Sep 2011 18:14:08 +0200 Subject: [IMP] logging debug use pprint bzr revid: al@openerp.com-20110907161408-0b4y5irl3c95mtn4 --- addons/web/common/dispatch.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'addons/web/common/dispatch.py') diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py index a88c5b6289c..2375623532c 100644 --- a/addons/web/common/dispatch.py +++ b/addons/web/common/dispatch.py @@ -4,6 +4,7 @@ from __future__ import with_statement import functools import logging import os +import pprint import sys import traceback import uuid @@ -161,7 +162,8 @@ class JsonRequest(WebRequest): else: self.jsonrequest = simplejson.loads(request, object_hook=nonliterals.non_literal_decoder) self.init(self.jsonrequest.get("params", {})) - _logger.debug("--> %s.%s %s", controller.__class__.__name__, method.__name__, self.jsonrequest) + 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') response["result"] = method(controller, self, **self.params) except backend.OpenERPUnboundException: @@ -198,7 +200,8 @@ class JsonRequest(WebRequest): if error: response["error"] = error - _logger.debug("<-- %s", response) + if _logger.isEnabledFor(logging.DEBUG): + _logger.debug("<--\n%s", pprint.pformat(response)) content = simplejson.dumps(response, cls=nonliterals.NonLiteralEncoder) return werkzeug.wrappers.Response( content, headers=[('Content-Type', 'application/json'), @@ -420,6 +423,6 @@ class Root(object): meth = rest[0] m = getattr(c, meth) if getattr(m, 'exposed', False): - _logger.debug("Dispatching to %s %s %s %s", ps, c, meth, m) + _logger.debug("Dispatching to %s %s %s", ps, c, meth) return m return None -- cgit v1.2.3 From 08a456b3691395d1e4bdf7689fd26f69b65b1231 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 7 Sep 2011 19:41:09 +0200 Subject: [FIX] debug by default until we fix css merging bzr revid: al@openerp.com-20110907174109-xgh3c4efdftpyujt --- addons/web/common/dispatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/common/dispatch.py') diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py index 2375623532c..0829f360806 100644 --- a/addons/web/common/dispatch.py +++ b/addons/web/common/dispatch.py @@ -316,7 +316,7 @@ class Root(object): by the server, will be filtered by this pattern """ def __init__(self, options): - self.root = werkzeug.urls.Href('/web/webclient/home') + self.root = werkzeug.urls.Href('/web/webclient/home?debug') self.config = options self.session_cookie = 'sessionid' -- cgit v1.2.3 From 2b8c7d511569157074b3592d95c2ed4c847ab7c1 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 13 Sep 2011 09:38:04 +0200 Subject: [FIX] unbreak explicitly providing ?debug parameter or clicking on logo to go back to home/reload page bzr revid: xmo@openerp.com-20110913073804-hiuksj2bu4pei6df --- addons/web/common/dispatch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/common/dispatch.py') diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py index 0829f360806..2336ca2d426 100644 --- a/addons/web/common/dispatch.py +++ b/addons/web/common/dispatch.py @@ -316,7 +316,7 @@ class Root(object): by the server, will be filtered by this pattern """ def __init__(self, options): - self.root = werkzeug.urls.Href('/web/webclient/home?debug') + self.root = werkzeug.urls.Href('/web/webclient/home') self.config = options self.session_cookie = 'sessionid' @@ -349,7 +349,7 @@ class Root(object): if request.path == '/': return werkzeug.utils.redirect( - self.root(request.args), 301)( + self.root(dict(request.args, debug='')), 301)( environ, start_response) elif request.path == '/mobile': return werkzeug.utils.redirect( -- cgit v1.2.3