diff options
| author | Serdar Sutay <serdar@opscode.com> | 2014-12-08 15:38:01 -0800 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-12-08 18:48:33 -0800 |
| commit | c3740cd7df071df63e570ce7e9ed0f17049c76c5 (patch) | |
| tree | 2c8258031a4b27ec6c7dcc33bfdbb6d7f0074aea | |
| parent | b45a80c61a9d89ddf0d0167c74ecea0abd5fda96 (diff) | |
| download | chef-c3740cd7df071df63e570ce7e9ed0f17049c76c5.tar.gz | |
:interval setting can be used on Windows without fork when Chef Client windows service is enabled.
Make sure that we don't raise error when :interval is set with :client_fork if we are on windows.
| -rw-r--r-- | lib/chef/application/client.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index 5463f504bc..295dc2470e 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -272,7 +272,9 @@ class Chef::Application::Client < Chef::Application Chef::Config[:splay] = nil end - Chef::Application.fatal!(unforked_interval_error_message) if !Chef::Config[:client_fork] && Chef::Config[:interval] + if !Chef::Config[:client_fork] && Chef::Config[:interval] && !Chef::Platform.windows? + Chef::Application.fatal!(unforked_interval_error_message) + end if Chef::Config[:json_attribs] config_fetcher = Chef::ConfigFetcher.new(Chef::Config[:json_attribs]) |