diff options
| author | Olivier Dony <odo@odoo.com> | 2019-04-04 12:59:59 +0000 |
|---|---|---|
| committer | Nans Lefebvre <len@odoo.com> | 2019-04-05 14:10:41 +0000 |
| commit | 6fa292cec861da0ccfd3afe443062080171d2fc4 (patch) | |
| tree | c7a795fb0728853c52b52015be7cba262fa11fdb /odoo/addons/base/models/ir_mail_server.py | |
| parent | 552da8dc8d55962c69dcdfec6fc4509f61cb27f1 (diff) | |
[FIX] ir_mail_server, mail: catch SMTPServerDisconnected exceptions
If the smtp session was dead, it would lead the whole mail batch to fail.
opw 1949270
closes odoo/odoo#32424
Signed-off-by: Olivier Dony (odo) <odo@openerp.com>
Diffstat (limited to 'odoo/addons/base/models/ir_mail_server.py')
| -rw-r--r-- | odoo/addons/base/models/ir_mail_server.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/odoo/addons/base/models/ir_mail_server.py b/odoo/addons/base/models/ir_mail_server.py index 84b44c19aaf..285bc88822a 100644 --- a/odoo/addons/base/models/ir_mail_server.py +++ b/odoo/addons/base/models/ir_mail_server.py @@ -482,6 +482,8 @@ class IrMailServer(models.Model): # do not quit() a pre-established smtp_session if not smtp_session: smtp.quit() + except smtplib.SMTPServerDisconnected: + raise except Exception as e: params = (ustr(smtp_server), e.__class__.__name__, ustr(e)) msg = _("Mail delivery failed via SMTP server '%s'.\n%s: %s") % params |