wycats / merb-core fork watch download tarball
public
Rubygem
Forks65Right
Watchers634Right
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-core.git 
Since intention/option comment behind workers respawn in -k are not clear, do 
not let killing master with -k for now.
michaelklishin (author)
Sat Oct 11 21:24:54 -0700 2008
commit  3ae019fe96ffaa6cdaa79181279a1f8ef192eb69
tree    db5f0e921e84d1d7d1bab1c5ba09f373823f7943
parent  20fd63f05d75d10f8a6afc54c2295da259d89f78
0
lib/merb-core/config.rb 
...
324
325
326
327
 
328
329
330
 
...
324
325
326
 
327
328
329
330
 
0
@@ -324,7 +324,7 @@ module Merb
0
 
0
           opts.on("-k", "--kill PORT", "Force kill one merb worker " \
0
                   "by port number. This will cause the worker to" \
0
-                  "be respawned. If you want to kill ") do |port|
0
+                  "be respawned.") do |port|
0
             options[:action] = :kill_9
0
             port = "main" if port == "all"
0
             options[:port] = port
0
lib/merb-core/server.rb 
...
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
 
...
95
96
97
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
98
99
100
 
0
@@ -95,22 +95,6 @@ module Merb
0
           # turn
0
           if sig == "INT"
0
             kill_pid(sig, pid_file("main"))
0
-          else
0
-            # order is important here
0
-            
0
-            # then reap workers
0
-            # 
0
-            # there is no way to handle KILL so
0
-            # at_exit block does not work and
0
-            # processes do not clean up their
0
-            # pid files: lets do it ourselves
0
-            Dir["#{Merb.log_path}" / "*.pid"].each do |file|
0
-              kill_pid(sig, file)
0
-              ::FileUtils.rm_rf file
0
-            end
0
-
0
-            # reap master
0
-            kill_pid(sig, pid_file("main"))
0
           end
0
         else
0
           kill_pid(sig, pid_file(port))

Comments