Ensure server is stopped when knife is done

1 files changed, 8 insertions, 5 deletions

diff --git a/lib/chef/knife/serve.rb b/lib/chef/knife/serve.rb
index 936e34fc70..0e9dff937d 100644
--- a/lib/chef/knife/serve.rb
+++ b/lib/chef/knife/serve.rb
@@ -15,7 +15,6 @@ class Chef
         :long => '--chef-zero-host IP',
         :description => 'Overrides the host upon which chef-zero listens. Default is 127.0.0.1.'
 
-
       def configure_chef
         super
         Chef::Config.local_mode = true
@@ -31,10 +30,14 @@ class Chef
       end
 
       def run
-        server = Chef::Application.chef_zero_server
-        puts "Serving files from:\n#{server.options[:data_store].chef_fs.fs_description}"
-        server.stop
-        server.start(true) # to print header
+        begin
+          server = Chef::Application.chef_zero_server
+          output "Serving files from:\n#{server.options[:data_store].chef_fs.fs_description}"
+          server.stop
+          server.start(stdout) # to print header
+        ensure
+          server.stop
+        end
       end
     end
   end