merge

2 files changed, 10 insertions, 9 deletions

diff --git a/lib/mauve/notification.rb b/lib/mauve/notification.rb
index 745660a..c164afb 100644
--- a/lib/mauve/notification.rb
+++ b/lib/mauve/notification.rb
@@ -319,9 +319,7 @@ module Mauve
         #
         # A bit of alert de-bouncing.
         #
-        if already_sent_to.include?(person.username)
-          logger.info("Already sent notification of #{alert} to #{person.username}")
-        else
+        unless already_sent_to.include?(person.username)
           person.send_alert(level, alert)
           already_sent_to << person.username
         end
diff --git a/lib/mauve/person.rb b/lib/mauve/person.rb
index 8ce0952..fd8cf98 100644
--- a/lib/mauve/person.rb
+++ b/lib/mauve/person.rb
@@ -253,10 +253,8 @@ module Mauve
 
         #
         # Log the result
-        note =  "#{@alert.update_type.capitalize} #{name} notification to #{@person.username} (#{destination}) " +  (res ? "succeeded" : "failed" )
-        logger.info note+" about #{@alert}."
-        h = History.new(:alerts => [@alert], :type => "notification", :event => note, :user => @person.username)
-        h.save
+        #
+        logger.info "#{@alert.update_type.capitalize} #{name} notification to #{@person.username} (#{destination}) " +  (res ? "succeeded" : "failed" ) +" about #{@alert}."
 
         return res
       end
@@ -282,7 +280,7 @@ module Mauve
       # and are still suppressed.
       #
       if @suppressed or self.is_on_holiday?(now) or self.is_off_sick?(now)
-        note =  "#{alert.update_type.capitalize} notification to #{self.username} suppressed"
+        note =  "#{alert.update_type.capitalize} #{level} notification to #{self.username} suppressed"
         logger.info note + " about #{alert}."
         History.create(:alerts => [alert], :type => "notification", :event => note, :user => self.username)
         return true 
@@ -303,8 +301,13 @@ module Mauve
            :was_suppressed => was_suppressed, }
         ).instance_eval(&__send__(level))
       end
+      
+      res = [result].flatten.any?
+  
+      note = "#{alert.update_type.capitalize} #{level} notification to #{self.username} " +  (res ? "succeeded" : "failed" ) 
+      History.create(:alerts => [alert], :type => "notification", :event => note, :user => self.username)
 
-      return [result].flatten.any?
+      return res
     end
    
     #