From 38d755bacaa1b6aee0774be9c1cc90fb1df4fc94 Mon Sep 17 00:00:00 2001 From: Christopher Thorn Date: Mon, 11 Mar 2024 12:49:28 -0700 Subject: [PATCH] (PUP-12023) Add option for disabling catalog messages Add's a new Puppet setting, skip_logging_catalog_request_destination, which defaults to false and if set to true when the catalog is compiled Puppet will not output which server supplied the used catalog. --- lib/puppet/defaults.rb | 6 ++++++ lib/puppet/indirector/catalog/rest.rb | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index f6542f1bb06..97fed251066 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -172,6 +172,12 @@ def self.initialize_default_settings!(settings) end end }, + :skip_logging_catalog_request_destination => { + :default => false, + :type => :boolean, + :desc => "If you wish to suppress the notice of which compiler supplied the + catalog", + }, :merge_dependency_warnings => { :default => false, :type => :boolean, diff --git a/lib/puppet/indirector/catalog/rest.rb b/lib/puppet/indirector/catalog/rest.rb index 758ddff4f75..617ec35236f 100644 --- a/lib/puppet/indirector/catalog/rest.rb +++ b/lib/puppet/indirector/catalog/rest.rb @@ -16,12 +16,14 @@ def find(request) session = Puppet.lookup(:http_session) api = session.route_to(:puppet) - ip_address = begin - " (#{Resolv.getaddress(api.url.host)})" - rescue Resolv::ResolvError - nil + unless Puppet.settings[:skip_logging_catalog_request_destination] + ip_address = begin + " (#{Resolv.getaddress(api.url.host)})" + rescue Resolv::ResolvError + nil + end + Puppet.notice("Requesting catalog from #{api.url.host}:#{api.url.port}#{ip_address}") end - Puppet.notice("Requesting catalog from #{api.url.host}:#{api.url.port}#{ip_address}") _, catalog = api.post_catalog( request.key,