From 2366a8811bb450ec37e0cee82db645386daf49a3 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Fri, 25 May 2018 12:19:46 -0700 Subject: [PATCH] Catch exception from failed SMTP connection --- plexpy/notifiers.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index a4d11f84..069e31e2 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -1318,10 +1318,11 @@ class EMAIL(Notifier): recipients = self.config['to'] + self.config['cc'] + self.config['bcc'] + mailserver = None success = False - mailserver = smtplib.SMTP(self.config['smtp_server'], self.config['smtp_port']) try: + mailserver = smtplib.SMTP(self.config['smtp_server'], self.config['smtp_port']) mailserver.ehlo() if self.config['tls']: @@ -1332,14 +1333,15 @@ class EMAIL(Notifier): mailserver.login(str(self.config['smtp_user']), str(self.config['smtp_password'])) mailserver.sendmail(self.config['from'], recipients, msg.as_string()) + logger.info(u"Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME)) success = True except Exception as e: logger.error(u"Tautulli Notifiers :: {name} notification failed: {e}".format(name=self.NAME, e=e)) finally: - mailserver.quit() - logger.info(u"Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME)) + if mailserver: + mailserver.quit() return success