Allow for multiple email addresses.

vigetlabs · Oct 26, 2009 · 89fce90 · 89fce90
1 parent cb4275d
commit 89fce90
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/app/models/site.rb b/app/models/site.rb
@@ -13,7 +13,8 @@ def self.email
         email_name_regex  = '[A-Z0-9_\.%\+\-]+'
         domain_head_regex = '(?:[A-Z0-9\-]+\.)+'
         domain_tld_regex  = '(?:[A-Z]{2,4}|museum|travel)'
-        /\A#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}\z/i
+        full_email = "#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}"
+        /^#{full_email}(\s*,\s*#{full_email})*$/i
       end
     end
 

diff --git a/app/templates/monit_check.mustache b/app/templates/monit_check.mustache
@@ -3,8 +3,10 @@ check host {{monit_check_name}} with address {{host_name}}
     {{#match_text?}}and content == "{{match_text}}" {{/match_text?}}
     for {{threshold}} cycles
         then alert
+    {{#emails}}
     alert {{email}} with mail-format {
       subject: [WATCH DOG] $EVENT for {{site_name}}
       message: As of $DATE {{site_name}} is $EVENT:
                $DESCRIPTION
     }
+    {{/emails}}
diff --git a/app/views/monit_check.rb b/app/views/monit_check.rb
@@ -22,6 +22,10 @@ def url
     @site.url
   end
 
+  def emails
+    @site.email.split(/\s*,\s*/).map {|e| {:email => e} }
+  end
+
   def threshold
     @site.threshold
   end