From fc848abc8f5cb9452c7b929f6f1212d305b5cbdb Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Mon, 26 Nov 2012 17:04:38 +0000
Subject: Updated alert changed to log when saves fail, but saves them anyway.

---
 lib/mauve/alert_changed.rb | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/mauve/alert_changed.rb b/lib/mauve/alert_changed.rb
index 1712c7e..b76df58 100644
--- a/lib/mauve/alert_changed.rb
+++ b/lib/mauve/alert_changed.rb
@@ -108,13 +108,22 @@ module Mauve
       #
       self.remind_at = nil
 
-      if self.save
-        logger.debug "Successfully cleared #{self}"
-        true
-      else
-        logger.warn "Failed to clear #{self} -- this will lead to duplicate reminders."
-        false
+      unless self.save
+        #
+        # If the save has failed due to validation errors, but there aren't
+        # actually any errors, just save, by-passing validation.
+        #
+        if self.respond_to?("errors") and self.errors.is_a?(DataMapper::Validations::ValidationErrors) and self.errors.errors.empty?
+          logger.debug "Failed to save #{self.inspect} due to unexplained validation error. Saving again skipping validation."
+          self.save!
+          return true
+        else
+          logger.warn "Failed to clear #{self.inspect}, due to #{self.errors.inspect} -- this will lead to duplicate reminders."
+          return false
+        end
       end
+
+      return true
     end
     
     # The time this AlertChanged should next be polled at, or nil.  Mimics
-- 
cgit v1.2.3