Potential work-arounds for email problems (#80)

* Modifications to get around issues sending notifications via gmail- added second address and changed format of message * PEP8 line length fix
geopython · Jan 24, 2017 · 6d038f6 · 6d038f6
1 parent 704f9da
commit 6d038f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/GeoHealthCheck/config_main.py b/GeoHealthCheck/config_main.py
@@ -30,6 +30,8 @@
 DEBUG = False
 SQLALCHEMY_ECHO = False
 SQLALCHEMY_DATABASE_URI = 'sqlite:///data.db'
+# Alternative configuration for PostgreSQL database
+# SQLALCHEMY_DATABASE_URI = 'postgresql://user:password@host:port/database'
 
 # Replace None with 'your secret key string' in quotes
 SECRET_KEY = None
@@ -41,6 +43,7 @@
 GHC_NOTIFICATIONS_VERBOSITY = True
 GHC_WWW_LINK_EXCEPTION_CHECK = False
 GHC_ADMIN_EMAIL = 'you@example.com'
+GHC_NOTIFICATIONS_EMAIL = 'you2@example.com'
 GHC_SITE_TITLE = 'GeoHealthCheck Demonstration'
 GHC_SITE_URL = 'http://host'
 

diff --git a/GeoHealthCheck/notifications.py b/GeoHealthCheck/notifications.py
@@ -73,12 +73,17 @@ def notify(config, resource, run, last_run_success):
         'run': run
     }
 
-    msg = render_template2('notification_email.txt', template_vars)
+    msgbody = render_template2('notification_email.txt', template_vars)
 
     fromaddr = '%s <%s>' % (config['GHC_SITE_TITLE'],
                             config['GHC_ADMIN_EMAIL'])
-    toaddrs = config['GHC_ADMIN_EMAIL']
+    toaddrs = config['GHC_NOTIFICATIONS_EMAIL']
 
+    msg = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n" %
+           (config['GHC_ADMIN_EMAIL'], toaddrs, config['GHC_SITE_TITLE']))
+
+    msg = msg + msgbody
+    print msg
     server = smtplib.SMTP('%s:%s' % (config['GHC_SMTP']['server'],
                                      config['GHC_SMTP']['port']))
 

diff --git a/GeoHealthCheck/templates/notification_email.txt b/GeoHealthCheck/templates/notification_email.txt
@@ -1,4 +1,4 @@
-{{ _('Subject') }}: [{{ config.GHC_SITE_TITLE }}] {{ result }}: {{ resource.title }}
+{{ result }}: {{ resource.title }}
 
 
 {{ _('Hi: this is an automated message from the') }} {{ config.GHC_SITE_TITLE }} {{ _('service') }}.