0
@@ -1,4 +1,5 @@
0
 == 1.0.0 The Big release
0
+ * Add --force (-f) option to force stopping of a daemonized server, fixes [#72 state:resolved]
0
  * Update halycon adapter loader [mtodd]
0
 
0
 == 0.8.2 Double Margarita release

0
@@ -83,7 +83,7 @@ module Thin
0
         raise OptionRequired, :pid unless @options[:pid]
0
       
0
         tail_log(@options[:log]) do
0
-          if Server.kill(@options[:pid], @options[:timeout] || 60)
0
+          if Server.kill(@options[:pid], @options[:force] ? 0 : (@options[:timeout] || 60))
0
             wait_for_file :deletion, @options[:pid]
0
           end
0
         end

0
@@ -89,22 +89,16 @@ module Thin
0
     end
0
     
0
     module ClassMethods
0
-      # Send a QUIT signal the process which PID is stored in +pid_file+.
0
+      # Send a QUIT or INT (if timeout is +0+) signal the process which
0
+      # PID is stored in +pid_file+.
0
       # If the process is still running after +timeout+, KILL signal is
0
       # sent.
0
       def kill(pid_file, timeout=60)
0
-        if pid = send_signal('QUIT', pid_file)
0
-          Timeout.timeout(timeout) do
0
-            sleep 0.1 while Process.running?(pid)
0
-          end
0
+        if timeout == 0
0
+          send_signal('INT', pid_file, timeout)
0
+        else
0
+          send_signal('QUIT', pid_file, timeout)
0
         end
0
-      rescue Timeout::Error
0
-        print "Timeout! "
0
-        send_signal('KILL', pid_file)
0
-      rescue Interrupt
0
-        send_signal('KILL', pid_file)
0
-      ensure
0
-        File.delete(pid_file) if File.exist?(pid_file)
0
       end
0
       
0
       # Restart the server by sending HUP signal.
0
@@ -113,21 +107,28 @@ module Thin
0
       end
0
       
0
       # Send a +signal+ to the process which PID is stored in +pid_file+.
0
-      def send_signal(signal, pid_file)
0
-        if File.exist?(pid_file) && pid = open(pid_file).read
0
+      def send_signal(signal, pid_file, timeout=60)
0
+        if File.file?(pid_file) && pid = open(pid_file).read
0
           pid = pid.to_i
0
           print "Sending #{signal} signal to process #{pid} ... "
0
           Process.kill(signal, pid)
0
+          Timeout.timeout(timeout) do
0
+            sleep 0.1 while Process.running?(pid)
0
+          end
0
           puts
0
-          pid
0
         else
0
           puts "Can't stop process, no PID found in #{pid_file}"
0
-          nil
0
         end
0
+      rescue Timeout::Error
0
+        puts "Timeout! "
0
+        Process.kill("KILL", pid)
0
+      rescue Interrupt
0
+        Process.kill("KILL", pid)
0
       rescue Errno::ESRCH # No such process
0
         puts "process not found!"
0
-        nil
0
-      end
0
+      ensure
0
+        File.delete(pid_file) if File.exist?(pid_file)
0
+      end      
0
     end
0
     
0
     protected

0
@@ -102,6 +102,7 @@ module Thin
0
         opts.on("-b", "--backend CLASS", "Backend to use, full classname")              { |name| @options[:backend] = name }
0
         opts.on("-t", "--timeout SEC", "Request or command timeout in sec " +            
0
                                        "(default: #{@options[:timeout]})")              { |sec| @options[:timeout] = sec.to_i }
0
+        opts.on("-f", "--force", "Force the execution of the command")                  { @options[:force] = true }
0
         opts.on(      "--max-conns NUM", "Maximum number of connections " +
0
                                          "(default: #{@options[:max_conns]})",
0
                                          "Might require sudo to set higher then 1024")  { |num| @options[:max_conns] = num.to_i } unless Thin.win?

0
@@ -94,6 +94,23 @@ describe 'Daemonizing' do
0
     File.exist?(@server.pid_file).should be_false
0
   end
0
   
0
+  it 'should force kill process in pid file' do
0
+    @pid = fork do
0
+      @server.daemonize
0
+      loop { sleep 3 }
0
+    end
0
+  
0
+    server_should_start_in_less_then 3
0
+    
0
+    @pid = @server.pid
0
+  
0
+    silence_stream STDOUT do
0
+      TestServer.kill(@server.pid_file, 0)
0
+    end
0
+  
0
+    File.exist?(@server.pid_file).should be_false
0
+  end
0
+  
0
   it 'should send kill signal if timeout' do
0
     @pid = fork do
0
       @server.should_receive(:stop) # pretend we cannot handle the INT signal