diff options
| author | John Keiser <jkeiser@opscode.com> | 2013-09-12 22:10:58 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2013-09-12 22:10:58 -0700 |
| commit | a45e8fba0e6a068a41f57cd4347bd0a9f14eafc6 (patch) | |
| tree | 39695307b1721ac6bbb8982ae3eec5c8ac8a8a75 | |
| parent | 24f5669b95c1fcc035e77d88d00c6e92e94a801a (diff) | |
| download | chef-zero-a45e8fba0e6a068a41f57cd4347bd0a9f14eafc6.tar.gz | |
Make stop actually stop background servers
| -rw-r--r-- | lib/chef_zero/server.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb index 7acddd2..77a45a1 100644 --- a/lib/chef_zero/server.rb +++ b/lib/chef_zero/server.rb @@ -129,10 +129,9 @@ module ChefZero end def stop(wait = 5) + server.stop(true) if @thread @thread.join(wait) - else - server.stop(true) end rescue ChefZero::Log.error "Server did not stop within #{wait} seconds. Killing..." |