diff options
author | Eric Wong <normalperson@yhbt.net> | 2011-06-09 00:23:28 +0000 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2011-06-09 00:23:28 +0000 |
commit | 54deb6a9a0e868c0958c9ec145e311661ce90e54 (patch) | |
tree | 16a05d18609a2ce09a60491117ee1f490e93c9b7 | |
parent | 99244e8e30eded813bd8eaf7f2136a3871bd486c (diff) | |
download | rainbows-54deb6a9a0e868c0958c9ec145e311661ce90e54.tar.gz |
We may not always use Rainbows! :Base since we don't want keepalive/immediate log reopening in some cases.
-rw-r--r-- | lib/rainbows/base.rb | 7 | ||||
-rw-r--r-- | lib/rainbows/http_server.rb | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/rainbows/base.rb b/lib/rainbows/base.rb index e0c99e9..41daa2d 100644 --- a/lib/rainbows/base.rb +++ b/lib/rainbows/base.rb @@ -36,5 +36,12 @@ module Rainbows::Base klass.const_set :LISTENERS, Rainbows::HttpServer::LISTENERS end + def reopen_worker_logs(worker_nr) + logger.info "worker=#{worker_nr} reopening logs..." + Unicorn::Util.reopen_logs + logger.info "worker=#{worker_nr} done reopening logs" + rescue + Rainbows.quit! # let the master reopen and refork us + end # :startdoc: end diff --git a/lib/rainbows/http_server.rb b/lib/rainbows/http_server.rb index cbeb38f..be02630 100644 --- a/lib/rainbows/http_server.rb +++ b/lib/rainbows/http_server.rb @@ -21,14 +21,6 @@ class Rainbows::HttpServer < Unicorn::HttpServer @worker_connections ||= @use == :Base ? 1 : 50 end - def reopen_worker_logs(worker_nr) - logger.info "worker=#{worker_nr} reopening logs..." - Unicorn::Util.reopen_logs - logger.info "worker=#{worker_nr} done reopening logs" - rescue - Rainbows.quit! # let the master reopen and refork us - end - # Add one second to the timeout since our fchmod heartbeat is less # precise (and must be more conservative) than Unicorn does. We # handle many clients per process and can't chmod on every |