diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2013-05-01 11:53:12 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2013-05-01 11:53:12 +0100 |
| commit | 0267aaa13b2513cd40451932334ca72fbb62f2c0 (patch) | |
| tree | 944092614a698bc21f93a1a93d86d8ec6d84f622 /lib/mauve | |
| parent | 973afb547eeacc572b5834e6eaba513db4847f6e (diff) | |
Added conditions to prevent races.
Diffstat (limited to 'lib/mauve')
| -rw-r--r-- | lib/mauve/alert_changed.rb | 2 | ||||
| -rw-r--r-- | 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 |