diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/chef/provider/service/windows.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/chef/provider/service/windows.rb b/lib/chef/provider/service/windows.rb index 9a7f5fa1d8..6c1f7c3583 100644 --- a/lib/chef/provider/service/windows.rb +++ b/lib/chef/provider/service/windows.rb @@ -327,22 +327,18 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service retries = 0 loop do break if current_state == desired_state - raise Timeout::Error if ( retries += 1 ) > resource_timeout + raise Timeout::Error if ( retries += 1 ) > @new_resource.timeout sleep 1 end end - def resource_timeout - @resource_timeout ||= @new_resource.timeout - end - def spawn_command_thread worker = Thread.new do yield end - Timeout.timeout(resource_timeout) do + Timeout.timeout(@new_resource.timeout) do worker.join end end |