From 0eb2406427dee4d2999f99b91b974a86fda3af0f Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Sat, 16 Feb 2019 13:01:02 -0500 Subject: [PATCH] :ambulance: polling error on database concurrency error For explanation see https://github.com/odoo/odoo/commit/d7b7b07f9e9ead98d6ecc3e5ce3dca4d4a4a2b6f --- mail_base/__manifest__.py | 2 +- mail_base/controllers/main.py | 1 + mail_base/doc/changelog.rst | 4 ++++ mail_move_message/__manifest__.py | 2 +- mail_move_message/controllers/main.py | 1 + mail_move_message/doc/changelog.rst | 4 ++++ 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mail_base/__manifest__.py b/mail_base/__manifest__.py index 434e370..3ce27de 100644 --- a/mail_base/__manifest__.py +++ b/mail_base/__manifest__.py @@ -4,7 +4,7 @@ "summary": """Makes Mail extendable""", "category": "Discuss", "images": [], - "version": "1.0.4", + "version": "1.0.5", "author": "IT-Projects LLC, Pavel Romanchenko", "support": "apps@it-projects.info", diff --git a/mail_base/controllers/main.py b/mail_base/controllers/main.py index 06f8695..8463aed 100644 --- a/mail_base/controllers/main.py +++ b/mail_base/controllers/main.py @@ -10,6 +10,7 @@ class MailChatController(BusController): def _poll(self, dbname, channels, last, options): if request.session.uid: + channels = list(channels) # do not alter original list channels.append((request.db, 'mail_base.mail_sent')) return super(MailChatController, self)._poll(dbname, channels, last, options) diff --git a/mail_base/doc/changelog.rst b/mail_base/doc/changelog.rst index dd41f40..d1474d8 100644 --- a/mail_base/doc/changelog.rst +++ b/mail_base/doc/changelog.rst @@ -1,3 +1,7 @@ +`1.0.5` +------- +**FIX**: polling errors on heavy server load + `1.0.4` ------- **FIX**: issue related to clear cache diff --git a/mail_move_message/__manifest__.py b/mail_move_message/__manifest__.py index 438a563..103e46b 100644 --- a/mail_move_message/__manifest__.py +++ b/mail_move_message/__manifest__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- { 'name': 'Mail relocation', - 'version': '1.0.5', + 'version': '1.0.6', 'author': 'IT-Projects LLC, Ivan Yelizariev, Pavel Romanchenko', 'license': 'LGPL-3', 'category': 'Discuss', diff --git a/mail_move_message/controllers/main.py b/mail_move_message/controllers/main.py index bb51fc8..8d1aa9f 100644 --- a/mail_move_message/controllers/main.py +++ b/mail_move_message/controllers/main.py @@ -13,6 +13,7 @@ class MailChatController(BusController): def _poll(self, dbname, channels, last, options): if request.session.uid: + channels = list(channels) # do not alter original list channels.append((request.db, 'mail_move_message')) channels.append((request.db, 'mail_move_message.delete_message')) return super(MailChatController, self)._poll(dbname, channels, last, options) diff --git a/mail_move_message/doc/changelog.rst b/mail_move_message/doc/changelog.rst index 2021f90..d6f593d 100644 --- a/mail_move_message/doc/changelog.rst +++ b/mail_move_message/doc/changelog.rst @@ -1,3 +1,7 @@ +`1.0.6` +------- +**FIX**: polling errors on heavy server load + `1.0.5` -------