From 18b0906630ab4165d1e8b4bc66d7446b17c31605 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Thu, 14 Jul 2011 18:00:49 +0100
Subject:  * Improved logging.  * Updated message suppression

---
 lib/mauve/notifiers/templates/email.html.erb | 7 ++++++-
 lib/mauve/notifiers/templates/email.txt.erb  | 5 +++++
 lib/mauve/notifiers/templates/xmpp.txt.erb   | 8 +++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'lib/mauve/notifiers/templates')

diff --git a/lib/mauve/notifiers/templates/email.html.erb b/lib/mauve/notifiers/templates/email.html.erb
index bf5aed5..99f56d5 100644
--- a/lib/mauve/notifiers/templates/email.html.erb
+++ b/lib/mauve/notifiers/templates/email.html.erb
@@ -19,4 +19,9 @@ end
 <h2>Detail</h2>
 <div><%= RedCloth.new(alert.detail).to_html %></div>
 <hr />
-<address>--<br />Love mauve<br />xxx.</address></body></html>
+<% if was_supressed and not is_suppressed %>
+<p><strong>Better now.  Your notifications have now restarted.</strong></p>
+<% elsif is_supressed and not was_suppressed %>
+<p><strong>Too noisy!  Your notifications have been suppressed.</strong></p>
+<% end %>
+<address>-- <br />Love mauve<br />xxx.</address></body></html>
diff --git a/lib/mauve/notifiers/templates/email.txt.erb b/lib/mauve/notifiers/templates/email.txt.erb
index d112718..a08ec55 100644
--- a/lib/mauve/notifiers/templates/email.txt.erb
+++ b/lib/mauve/notifiers/templates/email.txt.erb
@@ -19,6 +19,11 @@ end
 
 -----------------------------------------------------------------------
 
+<% if was_supressed and not is_suppressed 
+%>Better now.  Your notifications have now restarted.<% 
+elsif is_supressed and not was_suppressed 
+%>Too noisy!  Your notifications have been suppressed.<% end %>
+
 --
 Love mauve.
 xx
diff --git a/lib/mauve/notifiers/templates/xmpp.txt.erb b/lib/mauve/notifiers/templates/xmpp.txt.erb
index 2f86cb6..d39500c 100644
--- a/lib/mauve/notifiers/templates/xmpp.txt.erb
+++ b/lib/mauve/notifiers/templates/xmpp.txt.erb
@@ -11,4 +11,10 @@ end
 if alert.source != alert.subject 
 %> -- from <%= alert.source %><%
 end 
-%>.
+%>.<%
+if was_suppressed and not is_suppressed 
+%> Normal service has resumed.<%
+elsif is_suppressed and not was_suppressed
+%> Further alerts supressed until things calm down.<%
+end 
+%>
-- 
cgit v1.2.1