diff options
author | Tim Smith <tsmith@chef.io> | 2021-03-01 15:57:44 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-01 15:57:44 -0800 |
commit | aaabd1157b0a1bc7e17f78c926b526f61bbdfcd7 (patch) | |
tree | d6a649badd50cb7905f4b617b2c7156103843e66 | |
parent | 8ec0d71abf0b1511d37bdbbf062b8ffdaefc2b7a (diff) | |
parent | ee5f8b06e6c9efb5d6d5e91ad2b4239d721976ff (diff) | |
download | chef-aaabd1157b0a1bc7e17f78c926b526f61bbdfcd7.tar.gz |
Merge pull request #11125 from ramereth/chef-16-chef_client_cron_append-stderr-fix
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | lib/chef/resource/chef_client_cron.rb | 2 | ||||
-rw-r--r-- | spec/unit/resource/chef_client_cron_spec.rb | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/chef/resource/chef_client_cron.rb b/lib/chef/resource/chef_client_cron.rb index 003b28d7b3..2e36b7bf69 100644 --- a/lib/chef/resource/chef_client_cron.rb +++ b/lib/chef/resource/chef_client_cron.rb @@ -213,7 +213,7 @@ class Chef # def log_command if new_resource.append_log_file - "-L #{::File.join(new_resource.log_directory, new_resource.log_file_name)}" + ">> #{::File.join(new_resource.log_directory, new_resource.log_file_name)} 2>&1" else "> #{::File.join(new_resource.log_directory, new_resource.log_file_name)} 2>&1" end diff --git a/spec/unit/resource/chef_client_cron_spec.rb b/spec/unit/resource/chef_client_cron_spec.rb index 121758ac73..b738a20a3a 100644 --- a/spec/unit/resource/chef_client_cron_spec.rb +++ b/spec/unit/resource/chef_client_cron_spec.rb @@ -93,41 +93,41 @@ describe Chef::Resource::ChefClientCron do it "creates a valid command if using all default properties" do expect(provider.client_command).to eql( - "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} -L /var/log/chef/client.log" + "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} >> /var/log/chef/client.log 2>&1" ) end it "uses daemon_options if set" do resource.daemon_options ["--foo 1", "--bar 2"] expect(provider.client_command).to eql( - "/bin/sleep 123; /opt/chef/bin/chef-client --foo 1 --bar 2 -c #{root_path} -L /var/log/chef/client.log" + "/bin/sleep 123; /opt/chef/bin/chef-client --foo 1 --bar 2 -c #{root_path} >> /var/log/chef/client.log 2>&1" ) end it "uses custom config dir if set" do resource.config_directory "/etc/some_other_dir" - expect(provider.client_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/some_other_dir/client.rb -L /var/log/chef/client.log") + expect(provider.client_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/some_other_dir/client.rb >> /var/log/chef/client.log 2>&1") end it "uses custom log files / paths if set" do resource.log_file_name "my-client.log" resource.log_directory "/var/log/my-chef/" expect(provider.client_command).to eql( - "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} -L /var/log/my-chef/my-client.log" + "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} >> /var/log/my-chef/my-client.log 2>&1" ) end it "uses mailto if set" do resource.mailto "bob@example.com" expect(provider.client_command).to eql( - "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} -L /var/log/chef/client.log || echo \"Chef Infra Client execution failed\"" + "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} >> /var/log/chef/client.log 2>&1 || echo \"Chef Infra Client execution failed\"" ) end it "uses custom chef-client binary if set" do resource.chef_binary_path "/usr/local/bin/chef-client" expect(provider.client_command).to eql( - "/bin/sleep 123; /usr/local/bin/chef-client -c #{root_path} -L /var/log/chef/client.log" + "/bin/sleep 123; /usr/local/bin/chef-client -c #{root_path} >> /var/log/chef/client.log 2>&1" ) end @@ -141,7 +141,7 @@ describe Chef::Resource::ChefClientCron do it "sets the license acceptance flag if set" do resource.accept_chef_license true expect(provider.client_command).to eql( - "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} --chef-license accept -L /var/log/chef/client.log" + "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} --chef-license accept >> /var/log/chef/client.log 2>&1" ) end @@ -149,7 +149,7 @@ describe Chef::Resource::ChefClientCron do allow(provider).to receive(:which).with("nice").and_return("/usr/bin/nice") resource.nice(-15) expect(provider.client_command).to eql( - "/bin/sleep 123; /usr/bin/nice -n -15 /opt/chef/bin/chef-client -c #{root_path} -L /var/log/chef/client.log" + "/bin/sleep 123; /usr/bin/nice -n -15 /opt/chef/bin/chef-client -c #{root_path} >> /var/log/chef/client.log 2>&1" ) end end |