diff options
| author | srb3 <sbrown@chef.io> | 2020-11-10 19:32:34 +0000 |
|---|---|---|
| committer | srb3 <sbrown@chef.io> | 2020-11-10 19:32:34 +0000 |
| commit | e08f734529d128883d46363e90d2a303ad7346cf (patch) | |
| tree | 3caf3e763a1a7ff0dca0572a0f4b0589a99caec8 | |
| parent | 8a16d20be5b3c268d8caa5077b851c0e030ff6d6 (diff) | |
| download | chef-e08f734529d128883d46363e90d2a303ad7346cf.tar.gz | |
removing log_location form array, and correcting logic for log_location string check
Signed-off-by: srb3 <sbrown@chef.io>
| -rw-r--r-- | lib/chef/resource/support/client.erb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef/resource/support/client.erb b/lib/chef/resource/support/client.erb index 4b66c0a2aa..6507c74440 100644 --- a/lib/chef/resource/support/client.erb +++ b/lib/chef/resource/support/client.erb @@ -10,7 +10,6 @@ @https_proxy @ftp_proxy @log_level - @log_location @minimal_ohai @named_run_list @no_proxy @@ -20,12 +19,12 @@ @policy_group @policy_name @ssl_verify_mode).each do |prop| -%> -<% next if instance_variable_get(prop).nil? || instance_variable_get(prop).empty? || prop == '@log_location' -%> +<% next if instance_variable_get(prop).nil? || instance_variable_get(prop).empty? -%> <%=prop.delete_prefix("@") %> <%= instance_variable_get(prop).inspect %> <% end -%> <%# log_location is special due to STDOUT/STDERR from String -> IO Object -%> <% unless @log_location.nil? %> - <% if (@log_location.is_a? String) && (%w(STDOUT STDERR).include?(@log_location)) -%> + <% if @log_location.is_a?(String) && %w(STDOUT STDERR).include?(@log_location) -%> log_location <%= @log_location %> <% else -%> log_location <%= @log_location.inspect %> |