diff --git a/addons/mail/tests/test_mail_followers.py b/addons/mail/tests/test_mail_followers.py index 7a82f09f381..249981706e1 100644 --- a/addons/mail/tests/test_mail_followers.py +++ b/addons/mail/tests/test_mail_followers.py @@ -4,6 +4,7 @@ from psycopg2 import IntegrityError from odoo.addons.mail.tests.common import TestMail +from odoo.tools.misc import mute_logger class TestMailFollowers(TestMail): @@ -134,7 +135,7 @@ class TestMailFollowers(TestMail): test_channel = self.env['mail.channel'].create({ 'name': 'I used to be schizo, but now we are alright.' }) - with self.assertRaises(IntegrityError): + with self.assertRaises(IntegrityError), mute_logger('odoo.sql_db'): self.env['mail.followers'].create({ 'res_model_id': self.env['ir.model']._get('mail.channel').id, 'res_id': test_channel.id, diff --git a/odoo/netsvc.py b/odoo/netsvc.py index b62f830eb9c..3c0bac45274 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 607bb9ba2b8..3f70d10a38c 100644 --- a/odoo/sql_db.py +++ b/odoo/sql_db.py @@ -231,7 +231,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