Better handling of quit in Mail, thanks Paolo Pastori

2020-05-31 18:22:00 -07:00
parent 2720f06789
commit 1ece50a988
1 changed files with 10 additions and 1 deletions
@@ -816,7 +816,16 @@ class Mail(object):
                        server.login(*self.settings.login.split(':', 1))
                    result = server.sendmail(sender, to, payload.as_string())
                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:
            logger.warning('Mail.send failure:%s' % e)
            self.result = result