From 8d209c0f6a1b3c47f9bc55b6f63cb14bfa935162 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Fri, 19 Aug 2011 14:50:56 +0100 Subject: Don't remind about acknowledged or cleared alerts! --- lib/mauve/alert_changed.rb | 5 ++--- lib/mauve/person.rb | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/mauve/alert_changed.rb b/lib/mauve/alert_changed.rb index 5cd8b2c..83332ff 100644 --- a/lib/mauve/alert_changed.rb +++ b/lib/mauve/alert_changed.rb @@ -59,9 +59,8 @@ module Mauve return save end - - if alert.acknowledged? - logger.info("Alert already acknowledged. Clearing reminder due for #{self.alert}.") + if alert.acknowledged? or alert.cleared? + logger.info("Alert already acknowledged/cleared. Clearing reminder due for #{self.alert}.") self.remind_at = nil return save end diff --git a/lib/mauve/person.rb b/lib/mauve/person.rb index e52b644..26425da 100644 --- a/lib/mauve/person.rb +++ b/lib/mauve/person.rb @@ -102,6 +102,12 @@ module Mauve return false end + # + # For the love of God, do not remind about ack'd or cleared alerts. + # + if alert.acknowledged? or alert.cleared? + remind_at = nil + end this_reminder = AlertChanged.new( :level => level.to_s, -- cgit v1.2.1