summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-04-17 13:21:28 -0700
committerTim Smith <tsmith@chef.io>2019-04-17 13:21:28 -0700
commitb4fc5a1634f3312a5318ece9ccfc58d5aebb775d (patch)
treeed859f03ad3338200d5ea2a1646923da1e141362
parentc7326d0b518ad7c22ffdf70413f5955888aba432 (diff)
downloadchef-b4fc5a1634f3312a5318ece9ccfc58d5aebb775d.tar.gz
Break the error message into 2 sentences
We can English Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/application.rb4
-rw-r--r--lib/chef/application/windows_service.rb2
-rw-r--r--spec/unit/application_spec.rb2
-rw-r--r--spec/unit/log/syslog_spec.rb4
-rw-r--r--spec/unit/log/winevt_spec.rb4
5 files changed, 8 insertions, 8 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index e7cb55093b..0eaf9721d9 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 instead.")
+ 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 instead.")
+ 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 1f075d41f1..a9da048ab8 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 instead.")
+ 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 480f38349f..e76e21bddc 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 instead.")
+ 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 37ee66ec40..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 instead.", nil)
- Chef::Log.warn("No config file found or specified on command line, using command line options instead.")
+ 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 34f04ee6e9..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 instead.", nil)
- Chef::Log.warn("No config file found or specified on command line, using command line options instead.")
+ 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