@@ -260,6 +260,7 @@ module Merb "merb proceses by port number. Use merb -K all to " \ "gracefully kill all merbs.") do |ports| options[:action] = :kill + ports = "main" if ports == "all" options[:port] = ports end @@ -267,6 +268,7 @@ module Merb "by port number. This will cause the worker to" \ "be respawned. If you want to kill ") do |port| options[:action] = :kill_9 + port = "main" if port == "all" options[:port] = port end lib/merb-core/config.rb @@ -71,31 +71,46 @@ module Merb def kill(port, sig="INT") Merb::BootLoader::BuildFramework.run begin - port = "gid" if port == "all" - pid = File.read(pid_file(port)).chomp.to_i - - kill_pid(sig, pid, pid_file(port)) - kill_pid(sig, -pid, pid_file(port)) - ensure - Merb.started = false - exit + if sig == 9 && port == "main" + Dir["#{Merb.log_path}" / "*.pid"].each do |file| + kill_pid(9, File.read(file).chomp.to_i, file) + end + else + pid = File.read(pid_file(port)).chomp.to_i + kill_pid(sig, pid, pid_file(port)) + end + rescue Errno::EACCES => e + Merb.fatal! e.message, e + rescue Errno::ENOENT => e + Merb.fatal! "Could not find a PID file at #{pid_file(port)}", e + 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 - def kill_pid(sig, pid) + def kill_pid(sig, pid, file) begin Process.kill(sig, pid) - FileUtils.rm(f) if File.exist?(f) - puts "killed PID #{pid} with signal #{sig}" + FileUtils.rm(file) if File.exist?(file) rescue Errno::EINVAL - puts "Failed to kill PID #{pid}: '#{sig}' is an invalid or unsupported signal number." + Merb.fatal! "Failed to kill PID #{pid}: '#{sig}' is an invalid " \ + "or unsupported signal number." rescue Errno::EPERM - puts "Failed to kill PID #{pid}: Insufficient permissions." + Merb.fatal! "Failed to kill PID #{pid}: Insufficient permissions." rescue Errno::ESRCH - puts "Failed to kill PID #{pid}: Process is deceased or zombie." - FileUtils.rm f + FileUtils.rm file + Merb.fatal! "Failed to kill PID #{pid}: Process is " \ + "deceased or zombie." rescue Exception => e - puts "Failed to kill PID #{pid}: #{e.message}" + if !e.is_a?(SystemExit) + Merb.fatal! "Failed to kill PID #{pid}", e + end end end @@ -186,12 +201,8 @@ module Merb FileUtils.rm(pid_file(port)) if File.file?(pid_file(port)) end - def store_gid - store_details - end - - def store_details(port = nil, type = port ? "pid" : "gid") - file = pid_file(port || type) + def store_details(port = nil) + file = pid_file(port) begin FileUtils.mkdir_p(File.dirname(file)) rescue Errno::EACCES => e @@ -199,7 +210,7 @@ module Merb "but you did not have access.", e end Merb.logger.warn! "Storing #{type} file to #{file}..." if Merb::Config[:verbose] - File.open(file, 'w'){ |f| f.write(Process.pid.to_s) } + File.open(file, 'w'){ |f| f.write(Process.pid.to_s) } end # Gets the pid file for the specified port. lib/merb-core/server.rb eb52fcec508a458af4d2d286223960b24a2954c3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/67e1756c267edb27f0229e0e7f9883736868742a 67e1756c267edb27f0229e0e7f9883736868742a 2008-09-27T18:27:12-07:00 2008-09-27T13:14:16-07:00 get merb -k and merb -K to work (with and without `all') 08412e7875ad02914fc7ffafed26f0c2461505f5 Yehuda Katz wycats@gmail.com