@@ -324,7 +324,7 @@ module Merb opts.on("-k", "--kill PORT", "Force kill one merb worker " \ "by port number. This will cause the worker to" \ - "be respawned. If you want to kill ") do |port| + "be respawned.") do |port| options[:action] = :kill_9 port = "main" if port == "all" options[:port] = port lib/merb-core/config.rb @@ -95,22 +95,6 @@ module Merb # 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)) lib/merb-core/server.rb 20fd63f05d75d10f8a6afc54c2295da259d89f78 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/3ae019fe96ffaa6cdaa79181279a1f8ef192eb69 3ae019fe96ffaa6cdaa79181279a1f8ef192eb69 2008-10-11T21:24:54-07:00 2008-10-11T21:24:54-07:00 Since intention/option comment behind workers respawn in -k are not clear, do not let killing master with -k for now. db5f0e921e84d1d7d1bab1c5ba09f373823f7943 Michael S. Klishin michael@novemberain.com