From c3740cd7df071df63e570ce7e9ed0f17049c76c5 Mon Sep 17 00:00:00 2001 From: Serdar Sutay Date: Mon, 8 Dec 2014 15:38:01 -0800 Subject: :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. --- lib/chef/application/client.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/chef/application') 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]) -- cgit v1.2.1