aboutsummaryrefslogtreecommitdiff
path: root/lib/mauve/notification.rb
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2011-06-13 11:02:37 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2011-06-13 11:02:37 +0100
commitb22cbc87927553f6dbb5754281e95fe9bad2eed1 (patch)
tree5575791fe84492648a8cc92433c267815056507a /lib/mauve/notification.rb
parent495c44445642cfae8f23fadde299ad5307f5be58 (diff)
* Tidied up mauveserver to handle HUP restarts
* Added HTML santizing to the alert class, so bad HTML is stripped as part of processing. * Alert#cleared? now means "not raised" * Better error handling in the Timer class, making sure that the timer never gets permanently frozen. * Moved notification and packet buffers to the Server class, meaning that if the Processor or Notifier threads crash, we don't lose all the items waiting to be processed/notified. * XMPP/Email Alerts now use templates, instead of instance methods. * Emails now get sent as multipart with HTML to allow detail fields to be shown as nature intended.
Diffstat (limited to 'lib/mauve/notification.rb')
-rw-r--r--lib/mauve/notification.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mauve/notification.rb b/lib/mauve/notification.rb
index 02bf6fd..089180b 100644
--- a/lib/mauve/notification.rb
+++ b/lib/mauve/notification.rb
@@ -119,7 +119,6 @@ module Mauve
end
def logger ; Log4r::Logger.new self.class.to_s ; end
-
# Updated code, now takes account of lists of people.
#
@@ -142,10 +141,10 @@ module Mauve
return
end
- # Should we notificy at all?
+ # Should we notify at all?
is_relevant = DuringRunner.new(MauveTime.now, alert, &during).now?
- to_notify = people.collect do |person|
+ people.collect do |person|
case person
when Person
person