Merge pull request #318 from itkovian/fix-mail-connect

Fix mail connect

Author: stdweird

lib/vsc/utils/mail.py

@@ -100,8 +100,6 @@ def _connect(self):
             s.login(user=self.smtp_auth_user, password=self.smtp_auth_password)
             logging.debug("Authenticated")
 
-        s.connect()
-
         return s
 
     def _send(self, mail_from, mail_to, mail_subject, msg):
@@ -119,15 +117,16 @@ def _send(self, mail_from, mail_to, mail_subject, msg):
             try:
                 s.sendmail(mail_from, mail_to, msg.as_string())
             except smtplib.SMTPHeloError as err:
-                logging.error("Cannot get a proper response from the SMTP host %s", self.mail_host)
+                logging.error("Cannot get a proper response from the SMTP host %s: %s", self.mail_host, err)
                 raise
             except smtplib.SMTPRecipientsRefused as err:
-                logging.error("All recipients were refused by SMTP host %s [%s]", self.mail_host, mail_to)
+                logging.error("All recipients were refused by SMTP host %s [%s]: %s", self.mail_host, mail_to, err)
                 raise
             except smtplib.SMTPSenderRefused as err:
-                logging.error("Sender was refused by SMTP host %s [%s]", self.mail_host, mail_from)
+                logging.error("Sender was refused by SMTP host %s [%s]: %s", self.mail_host, mail_from, err)
                 raise
             except smtplib.SMTPDataError as err:
+                logging.error("Data error: %s", err)
                 raise
 
         except smtplib.SMTPConnectError as err:

lib/vsc/utils/missing.py

@@ -318,6 +318,8 @@ def new_function(*args, **kwargs):
                         logging.warning("try_or_fail is sleeping for %d seconds before the next attempt", self.sleep)
                         time.sleep(self.sleep)
 
+                return None
+
         return new_function
 
 

setup.py

@@ -44,7 +44,7 @@
 ]
 
 PACKAGE = {
-    'version': '3.3.1',
+    'version': '3.3.2',
     'author': [sdw, jt, ag, kh],
     'maintainer': [sdw, jt, ag, kh],
     # as long as 1.0.0 is not out, vsc-base should still provide vsc.fancylogger