diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-09-06 15:32:31 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-09-06 15:32:31 +0100 |
| commit | d2309ac606e008123d42fcea0819f80fe2204f70 (patch) | |
| tree | 2dd085c8cec56d9b0f3d14d8975cc10a2bc179ad /lib/mauve/notifiers/templates/xmpp.txt.erb | |
| parent | 76e9883e5408e30d74187ef7b272312eb7479c50 (diff) | |
Update to suppression code.
XMPP interface fixed.
Diffstat (limited to 'lib/mauve/notifiers/templates/xmpp.txt.erb')
| -rw-r--r-- | lib/mauve/notifiers/templates/xmpp.txt.erb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mauve/notifiers/templates/xmpp.txt.erb b/lib/mauve/notifiers/templates/xmpp.txt.erb index 57f16f4..119c742 100644 --- a/lib/mauve/notifiers/templates/xmpp.txt.erb +++ b/lib/mauve/notifiers/templates/xmpp.txt.erb @@ -1,4 +1,4 @@ -<%= alert.update_type.upcase %>: <% +<%=alert.id %>: <%= alert.update_type.upcase %>: <% case alert.update_type when "cleared" %><%= alert.cleared_at.to_s_relative %><% @@ -12,10 +12,10 @@ if alert.source != alert.subject %> -- from <%= alert.source %><% end %>. <%=WebInterface.url_for(alert)%><% -if defined? was_suppressed and defined? is_suppressed - if was_suppressed and not is_suppressed +if defined? was_suppressed and defined? will_suppress + if was_suppressed and not will_suppress %> (Normal service has resumed.)<% - elsif is_suppressed and not was_suppressed + elsif will_suppress and not was_suppressed %> (Further alerts suppressed until things calm down.)<% end end |