github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 00:06:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Close email SMTP connection cleanly if exception

Browse source
This commit is contained in:
JonnyWong16 2018-05-06 22:43:55 -07:00
parent 826db082c9
commit f91b6481b3
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plexpy/notifiers.py
View file

@ -1310,26 +1310,30 @@ class EMAIL(Notifier):
recipients = self.config['to'] + self.config['cc'] + self.config['bcc'] recipients = self.config['to'] + self.config['cc'] + self.config['bcc']
success = False
mailserver = smtplib.SMTP(self.config['smtp_server'], self.config['smtp_port'])
try: try:
mailserver = smtplib.SMTP(self.config['smtp_server'], self.config['smtp_port']) mailserver.ehlo()
if self.config['tls']: if self.config['tls']:
mailserver.starttls() mailserver.starttls()
mailserver.ehlo()
mailserver.ehlo()
if self.config['smtp_user']: if self.config['smtp_user']:
mailserver.login(str(self.config['smtp_user']), str(self.config['smtp_password'])) mailserver.login(str(self.config['smtp_user']), str(self.config['smtp_password']))
mailserver.sendmail(self.config['from'], recipients, msg.as_string()) mailserver.sendmail(self.config['from'], recipients, msg.as_string())
mailserver.quit() success = True
logger.info(u"Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
return True
except Exception as e: except Exception as e:
logger.error(u"Tautulli Notifiers :: {name} notification failed: {e}".format(name=self.NAME, e=e)) logger.error(u"Tautulli Notifiers :: {name} notification failed: {e}".format(name=self.NAME, e=e))
return False
finally:
mailserver.quit()
logger.info(u"Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
return success
def get_user_emails(self): def get_user_emails(self):
emails = {u['email']: u['friendly_name'] for u in users.Users().get_users() if u['email']} emails = {u['email']: u['friendly_name'] for u in users.Users().get_users() if u['email']}