@@ -562,6 +562,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader end @ran = true + # process name you see in ps output $0 = "merb#{" : " + Merb::Config[:name] if Merb::Config[:name]} : master" # Log the process configuration user defined signal 1 (SIGUSR1) is received. @@ -604,7 +605,8 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader Process.waitall # remove master process pid Merb::Server.remove_pid("main") - # terminate + # terminate, workers remove their own pids + # in on exit hook exit end @@ -632,6 +634,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader loop do # create two connected endpoints + # we use them for master/workers communication reader, @writer = IO.pipe pid = Kernel.fork @@ -640,7 +643,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader # writer must be closed so reader can generate EOF condition @writer.close - # master process stores pid to merb.mail.pid + # master process stores pid to merb.main.pid Merb::Server.store_pid("main") if Merb::Config[:console_trap] lib/merb-core/bootloader.rb @@ -52,17 +52,18 @@ module Merb # # @api private def alive?(port) - puts "About to check if port #{port} is alive..." if Merb::Config[:verbose] pidfile = pid_file(port) - puts "Pidfile is #{pidfile}..." if Merb::Config[:verbose] - pid = File.read(pidfile).chomp.to_i - puts "Process id is #{pid}" if Merb::Config[:verbose] + pid = pid_in_file(pidfile) Process.kill(0, pid) true rescue Errno::ESRCH, Errno::ENOENT false rescue Errno::EACCES => e - Merb.fatal!("You don't have access to the PID file at #{pidfile}.", e) + Merb.fatal!("You don't have access to the PID file at #{pidfile}: #{e.message}") + end + + def pid_in_file(pidfile) + File.read(pidfile).chomp.to_i end # ==== Parameters @@ -84,9 +85,32 @@ module Merb Merb::BootLoader::BuildFramework.run # 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(sig, file) + if %w(main master all).include?(port) + # if graceful exit is requested, + # send INT to master process and + # it's gonna do it's job + # + # Otherwise read pids from pid files + # and try to kill each process in + # turn + if sig == "INT" + kill_pid(sig, pid_file("main")) + else + # order is important here + + # then reap workers + # + # there is no way to handle KILL so + # at_exit block does not work and + # processes do not clean up their + # pid files: lets do it ourselves + Dir["#{Merb.log_path}" / "*.pid"].each do |file| + kill_pid(sig, file) + ::FileUtils.rm_rf file + end + + # reap master + kill_pid(sig, pid_file("main")) end else kill_pid(sig, pid_file(port)) @@ -97,29 +121,29 @@ module Merb # @api private def kill_pid(sig, file) begin - pid = File.read(file).chomp.to_i + pid = pid_in_file(file) 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} with #{sig}: '#{sig}' is an invalid " \ + Merb.logger.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} with #{sig}: Insufficient permissions." + Merb.logger.fatal! "Failed to kill PID #{pid} with #{sig}: Insufficient permissions." rescue Errno::ESRCH FileUtils.rm file - Merb.fatal! "Failed to kill PID #{pid} with #{sig}: Process is " \ + Merb.logger.fatal! "Failed to kill PID #{pid} with #{sig}: Process is " \ "deceased or zombie." rescue Errno::EACCES => e - Merb.fatal! e.message, e + Merb.logger.fatal! e.message rescue Errno::ENOENT => 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 + Merb.logger.fatal! "Could not find a PID file at #{file}. Probably process is no longer running but pid file wasn't cleaned up." rescue Exception => e if !e.is_a?(SystemExit) - Merb.fatal! "Failed to kill PID #{pid} with #{sig}", e + Merb.logger.fatal! "Failed to kill PID #{pid.inspect} with #{sig.inspect}: #{e.message}" end end end lib/merb-core/server.rb 2d721c48372e8aaf85b5b6c4b653b83df0402915 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/20fd63f05d75d10f8a6afc54c2295da259d89f78 20fd63f05d75d10f8a6afc54c2295da259d89f78 2008-10-11T20:58:20-07:00 2008-10-11T20:58:20-07:00 (put my Frankenstein voice on) It's alive! 3a9822e7340c15f2c8eaeea43dbd864d98cd119c Michael S. Klishin michael@novemberain.com