diff options
| author | Jason Barnett <jason.w.barnett@gmail.com> | 2017-12-14 16:47:04 -0500 |
|---|---|---|
| committer | Jason Barnett <jason.w.barnett@gmail.com> | 2017-12-14 16:47:37 -0500 |
| commit | 254945563e90311f56563f042639d3e72cc8176c (patch) | |
| tree | 8e60749dc573493c1ab0af7bc98e8354154e04e4 | |
| parent | 8c9cc06ee3d0a8abe4984a88882211e63fd86b75 (diff) | |
| download | chef-254945563e90311f56563f042639d3e72cc8176c.tar.gz | |
Remove unused chef_server_fqdn argument: run_status
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the
best of my knowledge, is covered under an appropriate open
source license and I have the right under that license to
submit that work with modifications, whether created in whole
or in part by me, under the same open source license (unless
I am permitted to submit under a different license), as
Indicated in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including
all personal information I submit with it, including my
sign-off) is maintained indefinitely and may be redistributed
consistent with this project or the open source license(s)
involved.
Signed-off-by: Jason Barnett <jason.w.barnett@gmail.com>
| -rw-r--r-- | lib/chef/data_collector/messages.rb | 4 | ||||
| -rw-r--r-- | lib/chef/data_collector/messages/helpers.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/data_collector/messages.rb b/lib/chef/data_collector/messages.rb index ca854957d1..b4e30e8b5a 100644 --- a/lib/chef/data_collector/messages.rb +++ b/lib/chef/data_collector/messages.rb @@ -36,7 +36,7 @@ class Chef # def self.run_start_message(run_status) { - "chef_server_fqdn" => chef_server_fqdn(run_status), + "chef_server_fqdn" => chef_server_fqdn, "entity_uuid" => node_uuid, "id" => run_status.run_id, "message_version" => "1.0.0", @@ -61,7 +61,7 @@ class Chef run_status = reporter_data[:run_status] message = { - "chef_server_fqdn" => chef_server_fqdn(run_status), + "chef_server_fqdn" => chef_server_fqdn, "entity_uuid" => node_uuid, "expanded_run_list" => reporter_data[:expanded_run_list], "id" => run_status.run_id, diff --git a/lib/chef/data_collector/messages/helpers.rb b/lib/chef/data_collector/messages/helpers.rb index f42ddaaa4e..d9a3394265 100644 --- a/lib/chef/data_collector/messages/helpers.rb +++ b/lib/chef/data_collector/messages/helpers.rb @@ -31,7 +31,7 @@ class Chef # # @return [String] FQDN of the configured Chef Server, or node/localhost if not found. # - def chef_server_fqdn(run_status) + def chef_server_fqdn if !Chef::Config[:chef_server_url].nil? URI(Chef::Config[:chef_server_url]).host elsif !Chef::Config[:node_name].nil? |