dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mail timeout

Browse Source
This commit is contained in:
mdipierro
2015-01-15 09:47:57 -06:00
parent 181546e49d
commit bda69b0e88
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.9.12-beta+timestamp.2015.01.12.21.00.43 Version 2.9.12-beta+timestamp.2015.01.15.09.47.52
gluon/tools.py
+5 -2
View File
@@ -136,6 +136,7 @@ class Mail(object):
mail.settings.server mail.settings.server
mail.settings.sender mail.settings.sender
mail.settings.login mail.settings.login
mail.settings.timeout = 60 # seconds (default)
When server is 'logging', email is logged but not sent (debug mode) When server is 'logging', email is logged but not sent (debug mode)
@@ -265,6 +266,7 @@ class Mail(object):
settings.sender = sender settings.sender = sender
settings.login = login settings.login = login
settings.tls = tls settings.tls = tls
settings.timeout = 60 # seconds
settings.hostname = None settings.hostname = None
settings.ssl = False settings.ssl = False
settings.cipher_type = None settings.cipher_type = None
@@ -787,10 +789,11 @@ class Mail(object):
subject=subject, body=text, **xcc) subject=subject, body=text, **xcc)
else: else:
smtp_args = self.settings.server.split(':') smtp_args = self.settings.server.split(':')
kwargs = dict(timeout = self.settings.timeout)
if self.settings.ssl: if self.settings.ssl:
server = smtplib.SMTP_SSL(*smtp_args) server = smtplib.SMTP_SSL(*smtp_args, **kwargs)
else: else:
server = smtplib.SMTP(*smtp_args) server = smtplib.SMTP(*smtp_args, **kwargs)
if self.settings.tls and not self.settings.ssl: if self.settings.tls and not self.settings.ssl:
server.ehlo(self.settings.hostname) server.ehlo(self.settings.hostname)
server.starttls() server.starttls()