AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-13 01:58:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor NotificationHelper code

Browse source
This commit is contained in:
CD Nguyen 2018-04-04 09:41:13 +02:00
parent e9e3f17363
commit 96259c53bc
1 changed files with 28 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
bin/NotificationHelper.py
View file

@ -47,55 +47,37 @@ def sendEmailNotification(recipient, term):
if isinstance(sender_pw, tuple): if isinstance(sender_pw, tuple):
sender_pw = sender_pw[0] sender_pw = sender_pw[0]
if ( # raise an exception if any of these is None
sender is not None and if (sender is None or
sender_host is not None and sender_host is None or
sender_port is not None and sender_port is None
sender_pw is not None
):
try:
server_ssl = smtplib.SMTP_SSL(sender_host, sender_port)
server_ssl.ehlo()
server_ssl.login(sender, sender_pw)
mime_msg = MIMEMultipart()
mime_msg['From'] = sender
mime_msg['To'] = recipient
mime_msg['Subject'] = "AIL Term Alert"
body = "New occurrence for term: " + term
mime_msg.attach(MIMEText(body, 'plain'))
server_ssl.sendmail(sender, recipient, mime_msg.as_string())
server_ssl.quit()
except Exception as e:
print str(e)
# raise e
elif (
sender is not None and
sender_host is not None and
sender_port is not None
): ):
try: raise Exception('SMTP configuration (host, port, sender) is missing or incomplete!')
server = smtplib.SMTP(sender_host, sender_port) try:
if sender_pw is not None:
mime_msg = MIMEMultipart() smtp_server = smtplib.SMTP_SSL(sender_host, sender_port)
mime_msg['From'] = sender smtp_server.ehlo()
mime_msg['To'] = recipient smtp_server.login(sender, sender_pw)
mime_msg['Subject'] = "AIL Term Alert" else:
smtp_server = smtplib.SMTP(sender_host, sender_port)
body = "New occurrence for term: " + term
mime_msg.attach(MIMEText(body, 'plain')) mime_msg = MIMEMultipart()
mime_msg['From'] = sender
mime_msg['To'] = recipient
mime_msg['Subject'] = "AIL Term Alert"
body = "New occurrence for term: " + term
mime_msg.attach(MIMEText(body, 'plain'))
smtp_server.sendmail(sender, recipient, mime_msg.as_string())
smtp_server.quit()
server.sendmail(sender, recipient, mime_msg.as_string()) except Exception as e:
server.quit() print str(e)
# raise e
except Exception as e:
print str(e)
# raise e