[MERGE] forward port branch 10.0 up to c5c955db7ac

1 files changed, 3 insertions, 2 deletions

diff --git a/odoo/netsvc.py b/odoo/netsvc.py
index 0c64ebe51aa..7b9525747ba 100644
--- a/odoo/netsvc.py
+++ b/odoo/netsvc.py
@@ -48,7 +48,7 @@ def LocalService(name):
 path_prefix = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 
 class PostgreSQLHandler(logging.Handler):
-    """ PostgreSQL Loggin Handler will store logs in the database, by default
+    """ PostgreSQL Logging Handler will store logs in the database, by default
     the current database, can be set using --log-db=DBNAME
     """
     def emit(self, record):
@@ -58,7 +58,8 @@ class PostgreSQLHandler(logging.Handler):
         if not dbname:
             return
         with tools.ignore(Exception), tools.mute_logger('odoo.sql_db'), sql_db.db_connect(dbname, allow_uri=True).cursor() as cr:
-            cr.autocommit(True)
+            # preclude risks of deadlocks
+            cr.execute("SET LOCAL statement_timeout = 1000")
             msg = tools.ustr(record.msg)
             if record.args:
                 msg = msg % record.args