aboutsummaryrefslogtreecommitdiff
path: root/lib/mauve/server.rb
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2011-07-13 16:02:50 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2011-07-13 16:02:50 +0100
commite140af144e987ff7f6d767f2dc48b9cf685803fd (patch)
tree4a01971890865b4b3ca837d563bc673cbb787de8 /lib/mauve/server.rb
parentd28af4ec946c6aa4b645b73cef47d7e0c680bc0d (diff)
Big commit
* Added manpages for all binaries * Added log-reopening for mauvealert-server, and logrotate snippet * mauveserver now adds a user on install, and runs as that user * Big logging tidy-up * Alert subjects are only overwritten by the source, when the subject in the databse is empty * Removed various attr_writer methods that were being redifined * Added a notes box to the acknowledge form, but this doesn't work yet
Diffstat (limited to 'lib/mauve/server.rb')
-rw-r--r--lib/mauve/server.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/mauve/server.rb b/lib/mauve/server.rb
index 51587c0..4bd5a0f 100644
--- a/lib/mauve/server.rb
+++ b/lib/mauve/server.rb
@@ -43,7 +43,7 @@ module Mauve
# Sleep time between pooling the @buffer buffer.
@sleep = 1
- @freeze = false
+ @frozen = false
@stop = false
@stopped_at = MauveTime.now
@@ -166,7 +166,7 @@ module Mauve
begin
klass.instance.join
rescue StandardError => ex
- logger.warn "Caught #{ex.to_s} whilst checking #{klass} thread"
+ logger.error "Caught #{ex.to_s} whilst checking #{klass} thread"
logger.debug ex.backtrace.join("\n")
end
@@ -177,7 +177,8 @@ module Mauve
end
#
- # Now do the same with other threads.
+ # Now do the same with other threads. However if these ones crash, the
+ # server has to stop, as there is no method to restart them.
#
thread_list.each do |t|