diff options
author | Tim Smith <tsmith@chef.io> | 2019-04-19 15:23:40 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-19 15:23:40 -0700 |
commit | 495947554cc92b20bf6959e6ca5a873c417f4b16 (patch) | |
tree | cd874a728bdf81741afb794df97657b2999cc7b6 | |
parent | 6cdc8977fe699fa34b6542e852e60a60fa33b22a (diff) | |
parent | 80d0b50aa6ce9ee8b8c6c79a9f994efa4a38ce7f (diff) | |
download | chef-495947554cc92b20bf6959e6ca5a873c417f4b16.tar.gz |
Merge pull request #8401 from chef/better_errors
Improve the error message when no config can be loaded
-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..717d9e588b 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..de570068e3 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..f5959e7fb4 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..a5219fa8fb 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..d2e7784701 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 |