From 6b5646f70b1c14eadeb9778f93e078338f45f3f4 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Tue, 8 May 2012 14:21:45 +0100
Subject: Changed destroy! to destroy everywhere to ensure Histories are
 deleted correctly.  Added test.

---
 lib/mauve/alert_changed.rb  | 2 +-
 lib/mauve/notifiers/xmpp.rb | 2 +-
 lib/mauve/web_interface.rb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/mauve/alert_changed.rb b/lib/mauve/alert_changed.rb
index 0e0d257..2e3ac7d 100644
--- a/lib/mauve/alert_changed.rb
+++ b/lib/mauve/alert_changed.rb
@@ -71,7 +71,7 @@ module Mauve
     def remind
       unless alert.is_a?(Alert)
         logger.info "#{self.inspect} lost alert #{alert_id}.  Killing self."
-        destroy!
+        destroy
         return false
       end
       
diff --git a/lib/mauve/notifiers/xmpp.rb b/lib/mauve/notifiers/xmpp.rb
index 323f89d..dc44f1c 100644
--- a/lib/mauve/notifiers/xmpp.rb
+++ b/lib/mauve/notifiers/xmpp.rb
@@ -677,7 +677,7 @@ EOF
               next
             end
 
-            if alert.destroy!
+            if alert.destroy
               msg << "#{alert.to_s} destroyed"
             else
               msg << "#{alert.to_s}: destruction failed."
diff --git a/lib/mauve/web_interface.rb b/lib/mauve/web_interface.rb
index 9a46403..b5c0442 100644
--- a/lib/mauve/web_interface.rb
+++ b/lib/mauve/web_interface.rb
@@ -409,7 +409,7 @@ EOF
     
     post '/alert/:id/destroy' do
       alert = Alert.get(params[:id])
-      alert.destroy!
+      alert.destroy
       flash['notice'] = "Successfully destroyed alert #{alert.alert_id} from source #{alert.source}."
       redirect "/"
     end
-- 
cgit v1.2.1