fix alert email subject format

salesforce · Mar 10, 2017 · 9d29a95 · 9d29a95
1 parent 6a63b30
commit 9d29a95
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/alerts/email_alert.py b/alerts/email_alert.py
@@ -74,7 +74,7 @@ def send(self, alert=None, to_email=None, from_email=None):
         self.html = alert.message_html
 
         msg = MIMEMultipart('alternative')
-        msg['Subject'] = "Providence Alert: " + self.subject
+        msg['Subject'] = "" + self.subject
         msg['From'] = self.from_email
         msg['To'] = self.emails
 

diff --git a/plugins/basic_plugin_watcher/main.py b/plugins/basic_plugin_watcher/main.py
@@ -35,6 +35,9 @@ class Plugin(base.Plugin):
     # basic configurations
     configuration = config.Configuration('config.json')
     EMAIL_ALERT_RECIPIENTS = configuration.get(('email', 'to'))
+    EMAIL_ALERT_SUBJECT = configuration.get(('email', 'subject'))
+    if EMAIL_ALERT_SUBJECT is None or EMAIL_ALERT_SUBJECT is '':
+        EMAIL_ALERT_SUBJECT = '[Providence Email Alert]'
 
     # some regex filename constants
     JAVA_SOURCE_FILE_PATTERN = "\.java$"
@@ -98,7 +101,7 @@ def send_alert(self, repo_patch, repo_commit, subject, offending_line):
         filename = 'NOFILE'
         if repo_patch != None:
             filename = repo_patch.filename
-        subject = "[Providence Email Alert] - " + subject + ' in ' + repo_commit.identifier
+        subject = self.EMAIL_ALERT_SUBJECT + " " + subject + ' in ' + repo_commit.identifier
 
         # skip if the alert is duplicate
         if url + filename + subject + offending_line == Plugin.last_alert:

diff --git a/plugins/forcedotcom_base_watcher/__init__.py b/plugins/forcedotcom_base_watcher/__init__.py
@@ -33,6 +33,9 @@ class ForceDotComBasePlugin(base.Plugin):
     # basic configurations
     configuration = config.Configuration('config.json')
     EMAIL_ALERT_RECIPIENTS = configuration.get(('email', 'to'))
+    EMAIL_ALERT_SUBJECT = configuration.get(('email', 'subject'))
+    if EMAIL_ALERT_SUBJECT is None or EMAIL_ALERT_SUBJECT is '':
+        EMAIL_ALERT_SUBJECT = '[Providence Email Alert]'
 
     # some regex filename constants
     AURA_CMP_UI_SOURCE_FILE_PATTERN = "^((?<!auradocs)(?<!outputRichText).)*\.cmp$"
@@ -95,7 +98,7 @@ def send_alert(self, repo_patch, repo_commit, subject, offending_line):
         filename = 'NOFILE'
         if repo_patch != None:
             filename = repo_patch.filename
-        subject = "[Providence Email Alert] - " + subject + ' in ' + repo_commit.identifier
+        subject = self.EMAIL_ALERT_SUBJECT + " " + subject + ' in ' + repo_commit.identifier
 
         # skip if the alert is duplicate
         if url + filename + subject + offending_line == ForceDotComBasePlugin.last_alert: