diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-15 11:30:27 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-15 11:30:27 +0200 |
| commit | 50860317ccd2c1b44f873598858a3cff87fa7ea6 (patch) | |
| tree | 2b752e71a34a062112c2e28acf4a2993336ec3e6 /odoo/addons/base/models/ir_mail_server.py | |
| parent | 42ba1298d8d908c6d34b64f25be4e5c71e7888a3 (diff) | |
| parent | b170a753e18c96f59e8c99a4e1750a4b85628338 (diff) | |
[MERGE] forward port branch saas-11.2 up to b170a753e18
Diffstat (limited to 'odoo/addons/base/models/ir_mail_server.py')
| -rw-r--r-- | odoo/addons/base/models/ir_mail_server.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/odoo/addons/base/models/ir_mail_server.py b/odoo/addons/base/models/ir_mail_server.py index 97f100fb94b..9cf939dcf05 100644 --- a/odoo/addons/base/models/ir_mail_server.py +++ b/odoo/addons/base/models/ir_mail_server.py @@ -22,6 +22,8 @@ from odoo.tools import ustr, pycompat _logger = logging.getLogger(__name__) _test_logger = logging.getLogger('odoo.tests') +SMTP_TIMEOUT = 60 + class MailDeliveryException(except_orm): """Specific exception subclass for mail delivery errors""" @@ -246,9 +248,9 @@ class IrMailServer(models.Model): "You could use STARTTLS instead. " "If SSL is needed, an upgrade to Python 2.6 on the server-side " "should do the trick.")) - connection = smtplib.SMTP_SSL(smtp_server, smtp_port) + connection = smtplib.SMTP_SSL(smtp_server, smtp_port, timeout=SMTP_TIMEOUT) else: - connection = smtplib.SMTP(smtp_server, smtp_port) + connection = smtplib.SMTP(smtp_server, smtp_port, timeout=SMTP_TIMEOUT) connection.set_debuglevel(smtp_debug) if smtp_encryption == 'starttls': # starttls() will perform ehlo() if needed first |