diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-26 18:49:39 -0800 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-26 18:49:39 -0800 |
| commit | 41e6a4804fff41f88b121489aa0672c6fab9a1a2 (patch) | |
| tree | c491ea6b655c6dd756ddea6e3313d881dc498ec6 | |
| parent | dcebeaa6a1f1959ca8f73b7a7f732f60f0c6fb7c (diff) | |
| download | chef-41e6a4804fff41f88b121489aa0672c6fab9a1a2.tar.gz | |
Modify windows_service to use timeout
| -rw-r--r-- | lib/chef/application/windows_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb index ba7c6dab5a..05828424c4 100644 --- a/lib/chef/application/windows_service.rb +++ b/lib/chef/application/windows_service.rb @@ -189,7 +189,7 @@ class Chef config_params += " -c #{Chef::Config[:config_file]}" unless Chef::Config[:config_file].nil? config_params += " -L #{Chef::Config[:log_location]}" unless Chef::Config[:log_location] == STDOUT # Starts a new process and waits till the process exits - result = shell_out("chef-client #{config_params}") + result = shell_out("chef-client #{config_params}", :timeout => Chef::Config[:windows_service][:watchdog_timeout]) Chef::Log.debug "#{result.stdout}" Chef::Log.debug "#{result.stderr}" rescue Mixlib::ShellOut::ShellCommandFailed => e |