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

Better handling of quit in Mail, thanks Paolo Pastori

Browse Source
This commit is contained in:
mdipierro
2020-05-31 18:22:00 -07:00
parent 2720f06789
commit 1ece50a988
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tools.py
+10 -1
View File
@@ -816,7 +816,16 @@ class Mail(object):
server.login(*self.settings.login.split(':', 1)) server.login(*self.settings.login.split(':', 1))
result = server.sendmail(sender, to, payload.as_string()) result = server.sendmail(sender, to, payload.as_string())
finally: finally:
server.quit() # do not want to hide errors raising some exception here
try:
server.quit()
except:
pass
# ensure to close any socket with SMTP server
try:
server.close()
except:
pass
except Exception as e: except Exception as e:
logger.warning('Mail.send failure:%s' % e) logger.warning('Mail.send failure:%s' % e)
self.result = result self.result = result