Make sure that the datamapper query is evaluated when clearing all alerts.

2 files changed, 68 insertions, 6 deletions

diff --git a/lib/mauve/alert.rb b/lib/mauve/alert.rb
index 82f9e91..3307b59 100644
--- a/lib/mauve/alert.rb
+++ b/lib/mauve/alert.rb
@@ -902,12 +902,15 @@ module Mauve
         #
         if update.replace
           alert_ids_mentioned = update.alert.map { |alert| alert.id }
-          logger.info "Replacing all alerts from #{update.source} except "+alert_ids_mentioned.join(",")
-          all(:source => update.source, 
-              :alert_id.not => alert_ids_mentioned,
-              :cleared_at => nil
-              ).each do |alert_db|
-            alert_db.clear!
+          logger.info "Replacing all alerts from #{update.source}"+(alert_ids_mentioned.count > 0 ? " except "+alert_ids_mentioned.join(",") : "")
+          #
+          # The to_a is used here to make sure datamapper runs the query now,
+          # rather than at some point in the future.
+          #
+          Alert.all(:source => update.source, 
+              :alert_id.not => alert_ids_mentioned
+              ).to_a.each do |alert_db|
+            alert_db.clear! unless alert_db.cleared?
           end
         end
       
diff --git a/test/tc_mauve_notification.rb b/test/tc_mauve_notification.rb
index 448c3ca..525b536 100644
--- a/test/tc_mauve_notification.rb
+++ b/test/tc_mauve_notification.rb
@@ -1007,4 +1007,63 @@ EOF
     assert_equal("test2@example.com", sent[2])
   end
 
+  def test_nofitications_after_replace_alert
+    config=<<EOF
+server {
+  use_notification_buffer false
+}
+
+notification_method("email") {
+  debug!
+  deliver_to_queue []
+  disable_normal_delivery!
+}
+
+person ("test1") {
+  email "test1@example.com"
+  all { email }
+}
+
+alert_group("test") {
+  level URGENT
+
+  notify( %w(test1 test2)) {
+    every 300
+    during { true }
+  }
+}
+EOF
+    
+    Configuration.current = ConfigurationBuilder.parse(config)
+    notification_buffer = Configuration.current.notification_methods["email"].deliver_to_queue
+
+    Server.instance.setup
+
+    update = Proto::AlertUpdate.new
+    update.source = "test-host"
+    update.replace = true
+    message = Proto::Alert.new
+    update.alert << message
+    message.id = "test_recieve_update"
+    message.summary = "test summary"
+    message.detail  = "test detail"
+    message.raise_time = Time.now.to_i
+
+    Alert.receive_update(update, Time.now, "127.0.0.1")
+    assert_equal(1, notification_buffer.size, "Wrong number of notifications sent")
+    sent = notification_buffer.pop 
+
+    #
+    # Now send a second update with no alerts specified.
+    #
+
+    update = Proto::AlertUpdate.new
+    update.source = "test-host"
+    update.replace = true
+    Alert.receive_update(update, Time.now, "127.0.0.1")
+    assert_equal(1, notification_buffer.size, "Wrong number of notifications sent")
+    sent = notification_buffer.pop
+
+  end
+
 end