diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-08-04 14:27:52 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-08-04 14:27:52 +0100 |
| commit | 02a177d8e744f7e084bc69d10a0b7f8fb7e3bd44 (patch) | |
| tree | ba46705bc35bc3b8f0e01ac05bd6879e2c9d448e /lib/mauve/notifiers | |
| parent | 10141ed04af966ee280dcea1d733e0b036127afc (diff) | |
| parent | 451e7fac0b7cb6c7cb3659c8a4acceaab6125123 (diff) | |
merge
Diffstat (limited to 'lib/mauve/notifiers')
| -rw-r--r-- | lib/mauve/notifiers/email.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/mauve/notifiers/email.rb b/lib/mauve/notifiers/email.rb index a06d332..03384f7 100644 --- a/lib/mauve/notifiers/email.rb +++ b/lib/mauve/notifiers/email.rb @@ -51,8 +51,6 @@ module Mauve end end - protected - def prepare_message(destination, alert, all_alerts, conditions = {}) was_suppressed = conditions[:was_suppressed] || false is_suppressed = conditions[:is_suppressed] || false @@ -75,7 +73,7 @@ module Mauve m.header.to = destination m.header.from = @from - m.header.date = MauveTime.now + m.header.date = alert.updated_at.to_time || MauveTime.now m.header['Content-Type'] = "multipart/alternative" txt_template = File.join(File.dirname(__FILE__), "templates", "email.txt.erb") |