diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-04-19 09:37:53 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-04-19 09:37:53 +0100 |
| commit | 326bbd320dbabc075fd7e59e55a715c7d4e9d6b9 (patch) | |
| tree | aa637e7287aa7088c31cb0b320241214059a6a7f /lib/mauve/notifiers/email.rb | |
| parent | 89a67770e66d11740948e90a41db6cee0482cf8e (diff) | |
* added sane init script for server
* mauvesend now handles options better
* jabber client has stub message receivng method
Diffstat (limited to 'lib/mauve/notifiers/email.rb')
| -rw-r--r-- | lib/mauve/notifiers/email.rb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/mauve/notifiers/email.rb b/lib/mauve/notifiers/email.rb index c445e09..2c14a54 100644 --- a/lib/mauve/notifiers/email.rb +++ b/lib/mauve/notifiers/email.rb @@ -80,8 +80,7 @@ module Mauve m.header.from = @from m.header.date = MauveTime.now - summary_formatted = "" -# summary_formatted = " * "+alert.summary_two_lines.join("\n ") + summary_formatted = " * "+alert.summary_two_lines.join("\n ") case alert.update_type.to_sym when :cleared @@ -99,8 +98,8 @@ module Mauve # FIXME: include alert.detail as multipart mime ##Thread.abort_on_exception = true m.body += "\n" + '-'*10 + " This is the detail field " + '-'*44 + "\n\n" - #m.body += alert.get_details() - #m.body += alert.get_details_plain_text() + m.body += alert.get_details() + m.body += alert.get_details_plain_text() m.body += "\n" + '-'*80 + "\n\n" if @suppressed_changed == true @@ -122,12 +121,12 @@ single alert, you must watch the web front-end instead. "There is currently one other alert outstanding:\n\n" : "There are currently #{other_alerts.length} other alerts outstanding:\n\n" -# other_alerts.each do |other| -# m.body += " * "+other.summary_two_lines.join("\n ")+"\n\n" -# end + other_alerts.each do |other| + m.body += " * "+other.summary_two_lines.join("\n ")+"\n\n" + end end - m.body += @email_suffix + m.body += "-- \n"+@signature m.to_s end |