0
@@ -1,4 +1,5 @@
0
 == 0.8.2 ??? release
0
+ * Fix hanging when restarting and no process is running in single server move, fixes #67
0
  * Added Mack adapter [markbates]
0
  * Allow rackup .rb files by getting a conventionally named constant as the app [bmizerany]
0
 

0
@@ -83,17 +83,19 @@
0
         raise OptionRequired, :pid unless @options[:pid]
0
       
0
         tail_log(@options[:log]) do
0
-          Server.kill(@options[:pid], @options[:timeout] || 60)
0
-          wait_for_file :deletion, @options[:pid]
0
+          if Server.kill(@options[:pid], @options[:timeout] || 60)
0
+            wait_for_file :deletion, @options[:pid]
0
+          end
0
         end
0
       end
0
     
0
       def restart
0
         raise OptionRequired, :pid unless @options[:pid]
0
-            
0
+            
0
         tail_log(@options[:log]) do
0
-          Server.restart(@options[:pid])
0
-          wait_for_file :creation, @options[:pid]
0
+          if Server.restart(@options[:pid])
0
+            wait_for_file :creation, @options[:pid]
0
+          end
0
         end
0
       end
0
     
0
@@ -110,9 +112,11 @@
0
       protected
0
         # Wait for a pid file to either be created or deleted.
0
         def wait_for_file(state, file)
0
-          case state
0
-          when :creation then sleep 0.1 until File.exist?(file)
0
-          when :deletion then sleep 0.1 while File.exist?(file)
0
+          Timeout.timeout(@options[:log] || 30) do
0
+            case state
0
+            when :creation then sleep 0.1 until File.exist?(file)
0
+            when :deletion then sleep 0.1 while File.exist?(file)
0
+            end
0
           end
0
         end
0
         

0
@@ -94,17 +94,16 @@
0
       # sent.
0
       def kill(pid_file, timeout=60)
0
         if pid = send_signal('QUIT', pid_file)
0
-          begin
0
-            Timeout.timeout(timeout) do
0
-              sleep 0.1 while Process.running?(pid)
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
+          Timeout.timeout(timeout) do
0
+            sleep 0.1 while Process.running?(pid)
0
           end
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
@@ -174,7 +174,7 @@
0
     
0
     # +true+ if we're controlling a cluster.
0
     def cluster?
0
-      @options[:only] || @options[:servers]]
0
+      @options[:only] || @options[:servers] || @options[:config]
0
     end
0
     
0
     # +true+ if we're acting a as system service.

0
@@ -133,6 +133,12 @@
0
     proc { sleep 0.1 while File.exist?(@server.pid_file) }.should take_less_then(10)
0
   end
0
   
0
+  it "should not restart when not running" do
0
+    silence_stream STDOUT do
0
+      TestServer.restart(@server.pid_file)
0
+    end
0
+  end
0
+  
0
   it "should exit and raise if pid file already exist" do
0
     @pid = fork do
0
       @server.daemonize