summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2011-09-07 16:19:35 +0200
committerXavier Morel <xmo@openerp.com>2011-09-07 16:19:35 +0200
commit41dd08123341392bb48897f861f6a3a09293dfc4 (patch)
tree46d037c0e127149376c07f2cdd7763e08a08e4b7
parent51d0c0037b07d2f09437ba11eb494be451345848 (diff)
[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
-rw-r--r--addons/web/common/dispatch.py3
-rwxr-xr-xopenerp-web.py3
2 files changed, 3 insertions, 3 deletions
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)
diff --git a/openerp-web.py b/openerp-web.py
index 9153740b2a8..e58941448cd 100755
--- a/openerp-web.py
+++ b/openerp-web.py
@@ -47,6 +47,9 @@ if __name__ == "__main__":
if not options.log_config:
logging.basicConfig(level=getattr(logging, options.log_level.upper()))
+ dispatch = logging.getLogger('web.common.dispatch')
+ dispatch.addHandler(logging.StreamHandler(sys.stdout))
+ dispatch.propagate = False
else:
logging.config.fileConfig(options.log_config)