diff options
author | Tim Smith <tsmith@chef.io> | 2019-04-17 13:17:53 -0700 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2019-04-19 13:54:41 -0700 |
commit | 6b176a369ac25e791e9fab868f8ce6b29f239051 (patch) | |
tree | 3ffc165a85ae4f65da6447f6680347650bcdc714 | |
parent | 4ff9886fe012febe8432dccb485221dbed154ccf (diff) | |
download | chef-6b176a369ac25e791e9fab868f8ce6b29f239051.tar.gz |
Improve the error message when no config can be loaded
Make it more clear that we're going to use the CLI options instead since we couldn't find a config file.
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | lib/chef/application.rb | 4 | ||||
-rw-r--r-- | lib/chef/application/windows_service.rb | 2 | ||||
-rw-r--r-- | spec/unit/application_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/log/syslog_spec.rb | 4 | ||||
-rw-r--r-- | spec/unit/log/winevt_spec.rb | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb index a63d8218f4..b476e476e4 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -132,10 +132,10 @@ class Chef config[:config_file] = config_fetcher.expanded_path if config[:config_file].nil? - logger.warn("No config file found or specified on command line, using command line options.") + logger.warn("No config file found or specified on command line, using command line options instead.") elsif config_fetcher.config_missing? logger.warn("*****************************************") - logger.warn("Did not find config file: #{config[:config_file]}, using command line options.") + logger.warn("Did not find config file: #{config[:config_file]}, using command line options instead.") logger.warn("*****************************************") else config_content = config_fetcher.read_config diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb index 3c73a4925d..44eded5050 100644 --- a/lib/chef/application/windows_service.rb +++ b/lib/chef/application/windows_service.rb @@ -313,7 +313,7 @@ class Chef end rescue Errno::ENOENT Chef::Log.warn("*****************************************") - Chef::Log.warn("Did not find config file: #{config[:config_file]}, using command line options.") + Chef::Log.warn("Did not find config file: #{config[:config_file]}, using command line options instead.") Chef::Log.warn("*****************************************") Chef::Config.merge!(config) diff --git a/spec/unit/application_spec.rb b/spec/unit/application_spec.rb index b8d7242466..f084c0c7de 100644 --- a/spec/unit/application_spec.rb +++ b/spec/unit/application_spec.rb @@ -162,7 +162,7 @@ describe Chef::Application do it "should emit a warning" do expect(Chef::Config).not_to receive(:from_file).with("/etc/chef/default.rb") - expect(Chef::Log).to receive(:warn).with("No config file found or specified on command line, using command line options.") + expect(Chef::Log).to receive(:warn).with("No config file found or specified on command line, using command line options instead.") @app.configure_chef end end diff --git a/spec/unit/log/syslog_spec.rb b/spec/unit/log/syslog_spec.rb index 4586503e88..37ee66ec40 100644 --- a/spec/unit/log/syslog_spec.rb +++ b/spec/unit/log/syslog_spec.rb @@ -40,8 +40,8 @@ describe "Chef::Log::Syslog", unix_only: true do end it "should send message with severity warning to syslog." do - expect(syslog).to receive(:add).with(2, "No config file found or specified on command line, using command line options.", nil) - Chef::Log.warn("No config file found or specified on command line, using command line options.") + expect(syslog).to receive(:add).with(2, "No config file found or specified on command line, using command line options instead.", nil) + Chef::Log.warn("No config file found or specified on command line, using command line options instead.") end it "should fallback into send message with severity info to syslog when wrong format." do diff --git a/spec/unit/log/winevt_spec.rb b/spec/unit/log/winevt_spec.rb index c7cc49f40d..34f04ee6e9 100644 --- a/spec/unit/log/winevt_spec.rb +++ b/spec/unit/log/winevt_spec.rb @@ -43,8 +43,8 @@ describe Chef::Log::WinEvt do end it "should send message with severity warning to Windows Event Log." do - expect(winevt).to receive(:add).with(2, "No config file found or specified on command line, using command line options.", nil) - Chef::Log.warn("No config file found or specified on command line, using command line options.") + expect(winevt).to receive(:add).with(2, "No config file found or specified on command line, using command line options instead.", nil) + Chef::Log.warn("No config file found or specified on command line, using command line options instead.") end it "should fallback into send message with severity info to Windows Event Log when wrong format." do |