diff options
author | John Keiser <jkeiser@opscode.com> | 2014-05-26 12:44:56 -0700 |
---|---|---|
committer | John Keiser <jkeiser@opscode.com> | 2014-05-26 12:44:56 -0700 |
commit | 0c35dfb5212e4a9c397f26f00d782a1c8303afbe (patch) | |
tree | 3bc77bcd6788e5eb7ae315e7e0c470d53c9f3f03 /lib/chef/knife | |
parent | 70a5a2b23317887fbdd1e3e6ac580f440a666cac (diff) | |
download | chef-0c35dfb5212e4a9c397f26f00d782a1c8303afbe.tar.gz |
Ensure server is stopped when knife is done
Diffstat (limited to 'lib/chef/knife')
-rw-r--r-- | lib/chef/knife/serve.rb | 13 |
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 |