diff options
| author | Thom May <thom@may.lt> | 2018-01-22 18:25:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 18:25:42 +0000 |
| commit | f73515c50357992ec04f28ad321b0f4717764d96 (patch) | |
| tree | e6c833bc589f89d7b2feb966dd31c9537b781261 | |
| parent | 32a49bda660bbcf2f4c4455e0d243ac69a5733bb (diff) | |
| parent | 254945563e90311f56563f042639d3e72cc8176c (diff) | |
| download | chef-f73515c50357992ec04f28ad321b0f4717764d96.tar.gz | |
Merge pull request #6670 from jasonwbarnett/remove-unused-argument
Remove unused chef_server_fqdn argument: run_status
| -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? |