@@ -566,7 +566,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader # Log the process configuration user defined signal 1 (SIGUSR1) is received. Merb.trap("USR1") do - Merb.logger.error! "Configuration:\n#{Merb::Config.to_hash.merge(:pid => $$).to_yaml}\n\n" + Merb.logger.fatal! "Configuration:\n#{Merb::Config.to_hash.merge(:pid => $$).to_yaml}\n\n" end if Merb::Config[:fork_for_class_load] && !Merb.testing? @@ -600,8 +600,11 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader # # @api private def exit_gracefully + # wait all workers to exit Process.waitall + # remove master process pid Merb::Server.remove_pid("main") + # terminate exit end @@ -643,6 +646,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader if Merb::Config[:console_trap] Merb.trap("INT") {} else + # send ABRT to worker on INT Merb.trap("INT") do Merb.logger.warn! "Reaping Workers" begin @@ -718,7 +722,9 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader # (Does not return.) # # @api private - def reap_workers(status = 0) + # @param status<Integer> The status code to exit with + # @param sig<String> The signal to send to workers + def reap_workers(status = 0, sig = "ABRT") Merb.exiting = true unless status == 128 begin @@ -731,7 +737,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader ($WORKERS || []).each do |p| threads << Thread.new do begin - Process.kill("ABRT", p) + Process.kill(sig, p) Process.wait2(p) rescue SystemCallError end lib/merb-core/bootloader.rb @@ -74,26 +74,23 @@ module Merb # processes. # # @api private - def kill(port, sig="INT") + def kill(port, sig = "INT") + # 9 => KILL + # 2 => INT + if sig.is_a?(Integer) + sig = Signal.list.invert[sig] + end + Merb::BootLoader::BuildFramework.run - if sig == 9 && port == "main" - kill_pid("INT", pid_file("main")) + # assume that if we kill master, + # workers should be reaped, too + if %w(main all).include?(port) Dir["#{Merb.log_path}" / "*.pid"].each do |file| - kill_pid(9, file) + kill_pid(sig, file) end else kill_pid(sig, pid_file(port)) end - - if sig.is_a?(Integer) - sig = Signal.list.invert[sig] - end - - if sig == "KILL" && port == "main" - Merb.fatal! "Killed all PIDs with signal KILL" - else - Merb.fatal! "Killed #{port} with signal #{sig}" - end end # Kills the process pointed at by the provided pid file. @@ -101,25 +98,28 @@ module Merb def kill_pid(sig, file) begin pid = File.read(file).chomp.to_i - Merb.logger.warn! "Killing pid #{pid}" + Merb.logger.fatal! "Killing pid #{pid} with #{sig}" Process.kill(sig, pid) FileUtils.rm(file) if File.exist?(file) rescue Errno::EINVAL - Merb.fatal! "Failed to kill PID #{pid}: '#{sig}' is an invalid " \ + Merb.fatal! "Failed to kill PID #{pid} with #{sig}: '#{sig}' is an invalid " \ "or unsupported signal number." rescue Errno::EPERM - Merb.fatal! "Failed to kill PID #{pid}: Insufficient permissions." + Merb.fatal! "Failed to kill PID #{pid} with #{sig}: Insufficient permissions." rescue Errno::ESRCH FileUtils.rm file - Merb.fatal! "Failed to kill PID #{pid}: Process is " \ + Merb.fatal! "Failed to kill PID #{pid} with #{sig}: Process is " \ "deceased or zombie." rescue Errno::EACCES => e Merb.fatal! e.message, e rescue Errno::ENOENT => e - Merb.fatal! "Could not find a PID file at #{file}", e + # This should not cause abnormal exit, that's why + # we do not use Merb.fatal but instead just + # log with max level. + Merb.logger.fatal! "Could not find a PID file at #{file}. Probably process is no longer running but pid file wasn't cleaned up.", e rescue Exception => e if !e.is_a?(SystemExit) - Merb.fatal! "Failed to kill PID #{pid}", e + Merb.fatal! "Failed to kill PID #{pid} with #{sig}", e end end end @@ -156,10 +156,7 @@ module Merb # # @api private def bootup - Merb.trap('TERM') { - Merb::BootLoader::LoadClasses.reap_workers if Merb::Config[:fork_for_class_load] - exit - } + Merb.trap('TERM') { shutdown } puts "Running bootloaders..." if Merb::Config[:verbose] BootLoader.run @@ -170,6 +167,13 @@ module Merb # Change process user/group to those specified in Merb::Config. # # @api private + def shutdown(status = 0) + # reap_workers does exit but may not be called + Merb::BootLoader::LoadClasses.reap_workers(status) if Merb::Config[:fork_for_class_load] + # that's why we exit explicitly here + exit(status) + end + def change_privilege if Merb::Config[:user] && Merb::Config[:group] Merb.logger.verbose! "About to change privilege to group " \ lib/merb-core/server.rb a68e147e759021d2e6ab1bd0e2d89fe4d9b1c2a1 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/2d721c48372e8aaf85b5b6c4b653b83df0402915 2d721c48372e8aaf85b5b6c4b653b83df0402915 2008-10-11T07:49:52-07:00 2008-10-11T07:49:52-07:00 Merge upstream, re-apply stash. 0fa3912b71ee6f8d5266b56fc69b28848a7aa1f6 Michael S. Klishin michael@novemberain.com