diff options
author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-06-13 11:02:37 +0100 |
---|---|---|
committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-06-13 11:02:37 +0100 |
commit | b22cbc87927553f6dbb5754281e95fe9bad2eed1 (patch) | |
tree | 5575791fe84492648a8cc92433c267815056507a /lib/mauve/configuration.rb | |
parent | 495c44445642cfae8f23fadde299ad5307f5be58 (diff) |
* Tidied up mauveserver to handle HUP restarts
* Added HTML santizing to the alert class, so bad HTML is stripped as part of
processing.
* Alert#cleared? now means "not raised"
* Better error handling in the Timer class, making sure that the timer never
gets permanently frozen.
* Moved notification and packet buffers to the Server class, meaning that if
the Processor or Notifier threads crash, we don't lose all the items waiting
to be processed/notified.
* XMPP/Email Alerts now use templates, instead of instance methods.
* Emails now get sent as multipart with HTML to allow detail fields to be
shown as nature intended.
Diffstat (limited to 'lib/mauve/configuration.rb')
-rw-r--r-- | lib/mauve/configuration.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/mauve/configuration.rb b/lib/mauve/configuration.rb index 4b7717d..66dfabf 100644 --- a/lib/mauve/configuration.rb +++ b/lib/mauve/configuration.rb @@ -73,13 +73,8 @@ module Mauve @alert_groups = [] @source_lists = SourceList.new() @logger = Log4r::Logger.new("Mauve") - end - def close - server.close - end - end class LoggerOutputterBuilder < ObjectBuilder @@ -442,7 +437,7 @@ module Mauve end def created_server(server) - raise ArgumentError.new("Only one 'server' clause can be specified") if + raise BuildError.new("Only one 'server' clause can be specified") if @result.server @result.server = server end |