diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-26 19:41:57 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-26 19:41:57 +0200 |
| commit | 46e1104ce12e3c31722d2f84ca79b78055e925d6 (patch) | |
| tree | 5c7bad6b82621305b08106393ca53a6edd47dc58 /odoo | |
| parent | 2771b23a35c27165b54904a9e433202a5cd226af (diff) | |
| parent | 681f03e30978af39e09bcad12e7a3d9392f23ccb (diff) | |
[MERGE] forward port branch saas-15 up to 681f03e3097
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/netsvc.py | 9 | ||||
| -rw-r--r-- | odoo/sql_db.py | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/odoo/netsvc.py b/odoo/netsvc.py index 3832ae10cd6..507e8e9c5c6 100644 --- a/odoo/netsvc.py +++ b/odoo/netsvc.py @@ -188,17 +188,16 @@ def init_logger(): for logconfig_item in logging_configurations: _logger.debug('logger level set: "%s"', logconfig_item) + DEFAULT_LOG_CONFIGURATION = [ 'odoo.http.rpc.request:INFO', 'odoo.http.rpc.response:INFO', - 'odoo.addons.web.http:INFO', - 'odoo.sql_db:INFO', ':INFO', ] PSEUDOCONFIG_MAPPER = { - 'debug_rpc_answer': ['odoo:DEBUG','odoo.http.rpc.request:DEBUG', 'odoo.http.rpc.response:DEBUG'], - 'debug_rpc': ['odoo:DEBUG','odoo.http.rpc.request:DEBUG'], - 'debug': ['odoo:DEBUG'], + 'debug_rpc_answer': ['odoo:DEBUG', 'odoo.sql_db:INFO', 'odoo.http.rpc:DEBUG'], + 'debug_rpc': ['odoo:DEBUG', 'odoo.sql_db:INFO', 'odoo.http.rpc.request:DEBUG'], + 'debug': ['odoo:DEBUG', 'odoo.sql_db:INFO'], 'debug_sql': ['odoo.sql_db:DEBUG'], 'info': [], 'warn': ['odoo:WARNING', 'werkzeug:WARNING'], diff --git a/odoo/sql_db.py b/odoo/sql_db.py index acd422b5d33..bf97fe63d42 100644 --- a/odoo/sql_db.py +++ b/odoo/sql_db.py @@ -237,7 +237,7 @@ class Cursor(object): res = self._obj.execute(query, params) except Exception as e: if self._default_log_exceptions if log_exceptions is None else log_exceptions: - _logger.info("bad query: %s \nERROR: %s", self._obj.query or query, e) + _logger.error("bad query: %s\nERROR: %s", self._obj.query or query, e) raise # simple query count is always computed |