summaryrefslogtreecommitdiff
path: root/odoo/addons/base/models/ir_mail_server.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-04-09 12:16:06 +0200
committerChristophe Simonis <chs@odoo.com>2019-04-09 12:16:06 +0200
commit6c8e30cae6ca5e4fe12e287ebd29d76544be57a3 (patch)
treecce147099046ba971a817b2a5b70fbd2f054c9d0 /odoo/addons/base/models/ir_mail_server.py
parent288d82a67137e206d30aaf572584e99cbee997b2 (diff)
parent6d4940675f18dbb98d1f3882863ee10e7a1e3a49 (diff)
[MERGE] forward port branch saas-12.1 up to 6d4940675f1
Diffstat (limited to 'odoo/addons/base/models/ir_mail_server.py')
-rw-r--r--odoo/addons/base/models/ir_mail_server.py2
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 b7597ebaa77..6773e1f61cc 100644
--- a/odoo/addons/base/models/ir_mail_server.py
+++ b/odoo/addons/base/models/ir_mail_server.py
@@ -483,6 +483,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