diff options
-rw-r--r-- | lib/unicorn.rb | 7 | ||||
-rw-r--r-- | test/exec/test_exec.rb | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/unicorn.rb b/lib/unicorn.rb index 6ab42c9..31af720 100644 --- a/lib/unicorn.rb +++ b/lib/unicorn.rb @@ -182,6 +182,7 @@ module Unicorn break when 'USR1' # user-defined (probably something like log reopening) kill_each_worker('USR1') + Unicorn::Util.reopen_logs reset_master when 'USR2' # exec binary, stay alive in case something went wrong reexec @@ -392,6 +393,12 @@ module Unicorn def init_worker_process(worker) TRAP_SIGS.each { |sig| trap(sig, 'IGNORE') } trap('CHLD', 'DEFAULT') + trap('USR1') do + @logger.info "worker=#{worker.nr} rotating logs..." + Unicorn::Util.reopen_logs + @logger.info "worker=#{worker.nr} done rotating logs" + end + $0 = "unicorn worker[#{worker.nr}]" @rd_sig.close if @rd_sig @wr_sig.close if @wr_sig diff --git a/test/exec/test_exec.rb b/test/exec/test_exec.rb index 4f997a3..4e981fd 100644 --- a/test/exec/test_exec.rb +++ b/test/exec/test_exec.rb @@ -53,13 +53,6 @@ logger Logger.new('#{COMMON_TMP.path}') before_fork do |server, worker_nr| server.logger.info "before_fork: worker=\#{worker_nr}" end -after_fork do |server, worker_nr| - trap('USR1') do # log rotation - server.logger.info "after_fork: worker=\#{worker_nr} rotating logs..." - Unicorn::Util.reopen_logs - server.logger.info "after_fork: worker=\#{worker_nr} done rotating logs" - end # trap('USR1') -end # after_fork EOS def setup |