0
@@ -39,6 +39,20 @@
0
   opts.on("-u", "--debugger",
0
           "Enable ruby-debugging for the server.") { options[:debugger] = true }
0
 
0
+  opts.on("-K", "--graceful PORT or all",
0
+          "Gracefully kill one rails process by port number. " +
0
+          "Use server -K all to gracefully kill all processes.") do |v|
0
+    options[:action] = :kill
0
+    options[:port] = v
0
+  end
0
+
0
+  opts.on("-k", "--kill PORT or all",
0
+          "Kill one rails process by port number. " +
0
+          "Use server -k all to kill all processes.") do |v|
0
+    options[:action] = :kill_9
0
+    options[:port] = v
0
+  end
0
+
0
   opts.separator ""
0
 
0
   opts.on("-h", "--help",
0
@@ -53,8 +67,5 @@
0
 
0
 Rails.rack_adapter = Rails::Rack::Adapter.get(options[:adapter])
0
 
0
-puts "=> Rails application starting on http://#{options[:host]}:#{options[:port]}"
0
-puts "=> Call with -d to detach"
0
-puts "=> Ctrl-C to shutdown server"
0
 Rails::Rack::Server.start(options)

0
@@ -25,6 +25,10 @@
0
           @adapters ||= Hash.new
0
           ids.each { |id| @adapters[id] = "::Rails::Rack::#{adapter_class}" }
0
         end
0
+
0
+        def run(app, options)
0
+          Rails::Rack::Server.store_pid(options[:port]) if options[:daemonize] || options[:cluster]
0
+        end
0
       end # class << self
0
       
0
     end # Adapter

0
@@ -2,7 +2,7 @@
0
 
0
 module Rails
0
   module Rack
0
-    class Ebb
0
+    class Ebb < Rails::Rack::Adapter
0
       # start an Ebb server on given host and port.
0
       
0
       # ==== Parameters
0
@@ -13,6 +13,7 @@
0
       # :port<Fixnum>:: The port Ebb should bind to.
0
       # :app:: The application
0
       def self.run(app, options = {})
0
+        super
0
         Rack::Handler::Ebb.run(app, options)
0
       end
0
     end

0
@@ -2,13 +2,14 @@
0
 
0
 module Rails
0
   module Rack
0
-    class FastCGI
0
+    class FastCGI < Rails::Rack::Adapter
0
       # ==== Parameters
0
       # opts<Hash>:: Options for FastCGI (see below).
0
       #
0
       # ==== Options (options)
0
       # :app<String>>:: The application name.
0
       def self.run(app, options = {})
0
+        super
0
         Rails::Rack::Handler::FastCGI.run(app, options)
0
       end
0
     end

0
@@ -3,7 +3,7 @@
0
 
0
 module Rails
0
   module Rack
0
-    class Mongrel
0
+    class Mongrel < Rails::Rack::Adapter
0
       # start server on given host and port.
0
       #
0
       # ==== Parameters
0
@@ -14,6 +14,7 @@
0
       # :port<Fixnum>:: The port Mongrel should bind to.
0
       # :app<String>>:: The application name.
0
       def self.run(app, options = {})
0
+        super
0
         server = ::Mongrel::HttpServer.new(options[:host], options[:port].to_i)
0
         server.register('/', ::Rails::Rack::Handler::Mongrel.new(app))
0
         server.run.join

0
@@ -2,7 +2,7 @@
0
 
0
 module Rails
0
   module Rack
0
-    class Thin
0
+    class Thin < Rails::Rack::Adapter
0
       # start a Thin server on given host and port.
0
       #
0
       # ==== Parameters
0
@@ -13,6 +13,7 @@
0
       # :port<Fixnum>:: The port Thin should bind to.
0
       # :app<String>>:: The application name.
0
       def self.run(app, options = {})
0
+        super
0
         if options[:host].include?('/')
0
           options[:host] =  "#{options[:host]}-#{options[:port]}"
0
         end

0
@@ -3,7 +3,7 @@
0
 
0
 module Rails
0
   module Rack
0
-    class WEBrick
0
+    class WEBrick < Rails::Rack::Adapter
0
       # start WEBrick server on given host and port.
0
       #
0
       # ==== Parameters
0
@@ -14,6 +14,7 @@
0
       # :port<Fixnum>:: The port WEBrick should bind to.
0
       # :app<String>>:: The application name.
0
       def self.run(app, options = {})
0
+        super
0
         server_options = {
0
           :Port        => options[:port],
0
           :BindAddress => options[:host],

0
@@ -19,6 +19,10 @@
0
                 raise "=> Rails is already running on port: #{port}"
0
               end
0
             end
0
+          elsif options[:action] == :kill
0
+            kill(options[:port], 1)
0
+          elsif options[:action] == :kill_9
0
+            kill(options[:port])
0
           elsif options[:daemonize]
0
             unless alive?(@options[:port])
0
               remove_pid_file(@options[:port])
0
@@ -34,7 +38,10 @@
0
             app = Rails::Rack::Logger.new(app, "#{Rails.root}/log/#{@options[:environment]}.log")
0
             app = Rails::Rack::Debugger.new(app) if @options[:debugger]
0
 
0
-            puts("=> Using #{Rails.rack_adapter.to_s.demodulize} Rack adapter")
0
+            puts "=> Rails application starting on http://#{options[:host]}:#{options[:port]}"
0
+            puts "=> Call with -d to detach"
0
+            puts "=> Ctrl-C to shutdown server"
0
+            puts "=> Using #{Rails.rack_adapter.to_s.demodulize} Rack adapter"
0
             Rails.rack_adapter.run(app, @options)
0
           end
0
         end