diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2012-04-16 20:54:38 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2012-04-16 20:54:38 +0100 |
| commit | 2cca449f78116aa02072e2e6c5036f63c2ec962b (patch) | |
| tree | ba06e0f8d59a50847b5a7827f07b603e9793aa68 /lib/mauve/alert_group.rb | |
| parent | ccd064ab3e7e140e851f84e9d1e7f3b987c7b9d1 (diff) | |
Added time-fixation when processing "during" clauses, I think.
Diffstat (limited to 'lib/mauve/alert_group.rb')
| -rw-r--r-- | lib/mauve/alert_group.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/mauve/alert_group.rb b/lib/mauve/alert_group.rb index 2f234ec..aa47ef6 100644 --- a/lib/mauve/alert_group.rb +++ b/lib/mauve/alert_group.rb @@ -135,13 +135,16 @@ module Mauve # @return [Log4r::Logger] def logger ; self.class.logger ; end - # Signals that a given alert (which is assumed to belong in this group) - # has undergone a significant change. We resend this to every notify list. + # Signals that a given alert (which is assumed to belong in this group) has + # undergone a significant change. We resend this to every notify list. + # The time is used to determine the time to be used when evaluating + # "during" blocks in the notifier clauses. # # @param [Mauve::Alert] alert + # @param [Time] at # # @return [Boolean] indicates success or failure of alert. - def notify(alert) + def notify(alert, at=Time.now) # # If there are no notifications defined. # @@ -154,7 +157,7 @@ module Mauve # This is where we set the reminder -- i.e. on a per-alert-group basis. # remind_at = notifications.inject(nil) do |reminder_time, notification| - this_time = notification.remind_at_next(alert) + this_time = notification.remind_at_next(alert, at) if reminder_time.nil? or (!this_time.nil? and reminder_time > this_time) this_time else @@ -170,7 +173,7 @@ module Mauve :level => level.to_s, :alert_id => alert.id, :person => self.name, - :at => Time.now, + :at => at, :update_type => alert.update_type, :remind_at => remind_at, :was_relevant => true) @@ -183,7 +186,7 @@ module Mauve # sent_to = [] notifications.each do |notification| - sent_to << notification.notify(alert, sent_to) + sent_to << notification.notify(alert, sent_to, at) end return (sent_to.length > 0) |