aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2012-11-29 20:59:30 +0000
committerPatrick J Cherry <patrick@bytemark.co.uk>2012-11-29 20:59:30 +0000
commit4a2d26f044bf931994010a68f5b38338f585b159 (patch)
tree3a8981b0f60019b8d05b2497704c82dd3de40df9
parent80dc93d4d691579cc5be72a9bb015dd6beb1581e (diff)
Tidied up history entries
-rw-r--r--lib/mauve/alert.rb4
-rw-r--r--lib/mauve/alert_group.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/mauve/alert.rb b/lib/mauve/alert.rb
index 078fed4..8ccc045 100644
--- a/lib/mauve/alert.rb
+++ b/lib/mauve/alert.rb
@@ -354,9 +354,9 @@ module Mauve
# Add a note saying that notifications have been suppressed
#
if !should_notify
- history.event += " notifications suppressed"
+ history.event += " (notifications not required)"
elsif self.suppressed?
- history.event += " notifications suppressed until #{self.suppress_until}"
+ history.event += " (notifications suppressed until #{self.suppress_until.to_s_human})"
end
end
diff --git a/lib/mauve/alert_group.rb b/lib/mauve/alert_group.rb
index c570247..6738dc0 100644
--- a/lib/mauve/alert_group.rb
+++ b/lib/mauve/alert_group.rb
@@ -159,7 +159,7 @@ module Mauve
# Bail out if notifications for this alert have been suppressed.
#
if alert.suppressed?
- logger.info("Notifications suppressed until #{alert.suppress_until} for #{alert.inspect}")
+ logger.info("Notifications suppressed until #{alert.suppress_until} for #{alert}")
this_reminder = AlertChanged.first_or_new(
:alert_id => alert.id,