From 50f0e6a41ddb2433fa405502d639952e8f7868ff Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 24 Jun 2020 10:48:00 +0100 Subject: [PATCH] [FIX] mail_tracking: do not slurp exceptions This code chunk is expected to raise. Slurping it doesn't help upstream methods that rely on these exceptions. @Tecnativa TT24457 --- mail_tracking/models/ir_mail_server.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mail_tracking/models/ir_mail_server.py b/mail_tracking/models/ir_mail_server.py index 6aaf465b9..3f1abad62 100644 --- a/mail_tracking/models/ir_mail_server.py +++ b/mail_tracking/models/ir_mail_server.py @@ -80,9 +80,11 @@ class IrMailServer(models.Model): except Exception as e: if tracking_email: tracking_email.smtp_error(self, smtp_server_used, e) - if message_id and tracking_email: - vals = tracking_email._tracking_sent_prepare( - self, smtp_server_used, message, message_id) - if vals: - self.env['mail.tracking.event'].sudo().create(vals) + raise + finally: + if message_id and tracking_email: + vals = tracking_email._tracking_sent_prepare( + self, smtp_server_used, message, message_id) + if vals: + self.env['mail.tracking.event'].sudo().create(vals) return message_id