nmelone/POCloud-Email-Reports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes reports for use with Amazon SES

Browse Source
This commit is contained in:
Patrick McDonagh
2017-07-18 10:13:38 -05:00
parent 3408e85121
commit f75a051faf
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
abbflow_reports.py
View File

@@ -59,7 +59,7 @@ def main(device_type_name, sendEmail=False):
"""Get the data and optionally send an email.""" """Get the data and optionally send an email."""
if sendEmail: if sendEmail:
if not SMTP_EMAIL or not SMTP_PASSWORD: if not SMTP_EMAIL or not SMTP_PASSWORD:
print("Be sure to set the SMTP email and password as environment variables SMTP_EMAIL and SMTP_PASSWORD") print("[{}] Be sure to set the SMTP email and password as environment variables SMTP_EMAIL and SMTP_PASSWORD".format(datetime.now().isoformat()))
exit() exit()
devicetypes = meshify.query_meshify_api("devicetypes") devicetypes = meshify.query_meshify_api("devicetypes")
@@ -138,8 +138,8 @@ def main(device_type_name, sendEmail=False):
try: try:
email_to = to_lookup[comp] email_to = to_lookup[comp]
except KeyError: except KeyError:
print("No recipients for that company!") print("[{}] No recipients for that company ({})!".format(datetime.now().isoformat(), comp))
next() continue
# part1 = MIMEText(header + values, "plain") # part1 = MIMEText(header + values, "plain")
attachment = MIMEBase('application', 'octet-stream') attachment = MIMEBase('application', 'octet-stream')
attachment.set_payload(header + values) attachment.set_payload(header + values)
@@ -159,10 +159,11 @@ def main(device_type_name, sendEmail=False):
# msg.attach(part2) # msg.attach(part2)
msg.attach(attachment) msg.attach(attachment)
s = SMTP(host="secure.emailsrvr.com", port=25) s = SMTP(host="email-smtp.us-east-1.amazonaws.com", port=587)
s.starttls()
s.login(SMTP_EMAIL, SMTP_PASSWORD) s.login(SMTP_EMAIL, SMTP_PASSWORD)
s.sendmail(from_addr="alerts@henry-pump.com", to_addrs=email_to, msg=msg.as_string()) s.sendmail(from_addr="alerts@henry-pump.com", to_addrs=email_to, msg=msg.as_string())
print("Email sent to {}".format(email_to)) print("[{}] Email sent to {} for {}".format(datetime.now().isoformat(), email_to, comp))
sleep(2) sleep(2)
with open('{}-{}.csv'.format(comp, device_type_name), 'w') as csvfile: with open('{}-{}.csv'.format(comp, device_type_name), 'w') as csvfile:

12
advvfdipp_reports.py
View File

@@ -62,7 +62,7 @@ def main(sendEmail=False):
"""Get the data and optionally send an email.""" """Get the data and optionally send an email."""
if sendEmail: if sendEmail:
if not SMTP_EMAIL or not SMTP_PASSWORD: if not SMTP_EMAIL or not SMTP_PASSWORD:
print("Be sure to set the SMTP email and password as environment variables SMTP_EMAIL and SMTP_PASSWORD") print("[{}] Be sure to set the SMTP email and password as environment variables SMTP_EMAIL and SMTP_PASSWORD".format(datetime.now().isoformat()))
exit() exit()
devicetypes = meshify.query_meshify_api("devicetypes") devicetypes = meshify.query_meshify_api("devicetypes")
@@ -141,8 +141,8 @@ def main(sendEmail=False):
try: try:
email_to = to_lookup[comp] email_to = to_lookup[comp]
except KeyError: except KeyError:
print("No recipients for that company!") print("[{}] No recipients for that company({})!".format(datetime.now().isoformat(), comp))
next() continue
# part1 = MIMEText(header + values, "plain") # part1 = MIMEText(header + values, "plain")
attachment = MIMEBase('application', 'octet-stream') attachment = MIMEBase('application', 'octet-stream')
attachment.set_payload(header + values) attachment.set_payload(header + values)
@@ -162,10 +162,12 @@ def main(sendEmail=False):
# msg.attach(part2) # msg.attach(part2)
msg.attach(attachment) msg.attach(attachment)
s = SMTP(host="secure.emailsrvr.com", port=25) # s = SMTP(host="secure.emailsrvr.com", port=25)
s = SMTP(host="email-smtp.us-east-1.amazonaws.com", port=587)
s.starttls()
s.login(SMTP_EMAIL, SMTP_PASSWORD) s.login(SMTP_EMAIL, SMTP_PASSWORD)
s.sendmail(from_addr="alerts@henry-pump.com", to_addrs=email_to, msg=msg.as_string()) s.sendmail(from_addr="alerts@henry-pump.com", to_addrs=email_to, msg=msg.as_string())
print("Email sent to {}".format(email_to)) print("[{}] Email sent to {} for {}".format(datetime.now().isoformat(), email_to, comp))
sleep(2) sleep(2)
with open('{}.csv'.format(comp), 'w') as csvfile: with open('{}.csv'.format(comp), 'w') as csvfile: