From 0267aaa13b2513cd40451932334ca72fbb62f2c0 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Wed, 1 May 2013 11:53:12 +0100 Subject: Added conditions to prevent races. --- lib/mauve/alert_changed.rb | 2 +- lib/mauve/alert_group.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/mauve/alert_changed.rb b/lib/mauve/alert_changed.rb index 2b9dfe5..6925085 100644 --- a/lib/mauve/alert_changed.rb +++ b/lib/mauve/alert_changed.rb @@ -110,7 +110,7 @@ module Mauve # # Push this notifitcation onto the queue. # - Server.notification_push([alert, Time.now]) + Server.notification_push([alert, self.remind_at]) end # diff --git a/lib/mauve/alert_group.rb b/lib/mauve/alert_group.rb index 6126ed3..424ba88 100644 --- a/lib/mauve/alert_group.rb +++ b/lib/mauve/alert_group.rb @@ -239,7 +239,8 @@ module Mauve this_reminder = AlertChanged.first_or_new( :alert_id => alert.id, :person => self.name, - :remind_at.not => nil + :remind_at.not => nil, + :remind_at.gt => at ) this_reminder.level = level.to_s -- cgit v1.2.1