diff options
Diffstat (limited to 'lib/chef/application')
| -rw-r--r-- | lib/chef/application/client.rb | 17 | ||||
| -rw-r--r-- | lib/chef/application/solo.rb | 21 |
2 files changed, 7 insertions, 31 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index f839ef25df..32530925d5 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -2,7 +2,7 @@ # Author:: AJ Christensen (<aj@chef.io) # Author:: Christopher Brown (<cb@chef.io>) # Author:: Mark Mzyk (mmzyk@chef.io) -# Copyright:: Copyright 2008-2018, Chef Software Inc. +# Copyright:: Copyright 2008-2016, Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -360,12 +360,8 @@ class Chef::Application::Client < Chef::Application Chef::Config[:splay] = nil end - if Chef::Config[:interval] - if Chef::Platform.windows? - Chef::Application.fatal!(windows_interval_error_message) - elsif !Chef::Config[:client_fork] - Chef::Application.fatal!(unforked_interval_error_message) - end + if !Chef::Config[:client_fork] && Chef::Config[:interval] && !Chef::Platform.windows? + Chef::Application.fatal!(unforked_interval_error_message) end if Chef::Config[:json_attribs] @@ -512,13 +508,6 @@ class Chef::Application::Client < Chef::Application end end - def windows_interval_error_message - "Windows chef-client interval runs are disabled in Chef 14." + - "\nConfiguration settings:" + - "#{"\n interval = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]}" + - "\nPlease install chef-client as a Windows service or scheduled task instead." - end - def unforked_interval_error_message "Unforked chef-client interval runs are disabled in Chef 12." + "\nConfiguration settings:" + diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index b255951e3f..6b4aef42b4 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -1,7 +1,7 @@ # # Author:: AJ Christensen (<aj@chef.io>) # Author:: Mark Mzyk (mmzyk@chef.io) -# Copyright:: Copyright 2008-2018, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -261,13 +261,7 @@ class Chef::Application::Solo < Chef::Application Chef::Config[:interval] ||= 1800 end - if Chef::Config[:interval] - if Chef::Platform.windows? - Chef::Application.fatal!(windows_interval_error_message) - elsif !Chef::Config[:client_fork] - Chef::Application.fatal!(unforked_interval_error_message) - end - end + Chef::Application.fatal!(unforked_interval_error_message) if !Chef::Config[:client_fork] && Chef::Config[:interval] if Chef::Config[:recipe_url] cookbooks_path = Array(Chef::Config[:cookbook_path]).detect { |e| Pathname.new(e).cleanpath.to_s =~ /\/cookbooks\/*$/ } @@ -369,17 +363,10 @@ EOH end end - def windows_interval_error_message - "Windows chef-solo interval runs are disabled in Chef 14." + - "\nConfiguration settings:" + - "#{"\n interval = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]}" + - "\nPlease install chef-solo as a Windows service or scheduled task instead." - end - def unforked_interval_error_message - "Unforked chef-solo interval runs are disabled in Chef 12." + + "Unforked chef-client interval runs are disabled in Chef 12." + "\nConfiguration settings:" + "#{"\n interval = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]}" + - "\nEnable chef-solo interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options." + "\nEnable chef-client interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options." end end |