aboutsummaryrefslogtreecommitdiff
path: root/lib/mauve/notifiers
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2011-08-04 14:27:01 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2011-08-04 14:27:01 +0100
commit451e7fac0b7cb6c7cb3659c8a4acceaab6125123 (patch)
treeff43cd35e8e828f7b2a39e00ecaceb6e44cd49d1 /lib/mauve/notifiers
parentf07c5705d4ec82f4ba851409d4a92a9f66820df8 (diff)
Added pop3 server.
--HG-- rename : lib/mauve/auth_bytemark.rb => lib/mauve/authentication.rb
Diffstat (limited to 'lib/mauve/notifiers')
-rw-r--r--lib/mauve/notifiers/email.rb4
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")