Make stop more reliable (don't kill the thread unless necessary)

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index ff661ca..42774e8 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -117,14 +117,13 @@ module ChefZero
     end
 
     def stop(timeout = 5)
-      Timeout::timeout(timeout) do
+      begin
         server.stop
-        until !server.running? || !server_error
-          sleep(0.01)
-        end
-      end
-      if @thread
-        @thread.kill
+        @thread.join(timeout)
+        @thread = nil
+      rescue
+        Chef::Log.error("Server did not stop within #{timeout}s.  Killing.")
+        @thread.kill if @thread
         @thread = nil
       end
     end