Merge pull request #9310 from puppetlabs/backport-9288-to-7.x

[Backport 7.x] (PUP-12023) Add option for disabling catalog messages
puppetlabs · Apr 2, 2024 · 4bb2994 · 4bb2994
2 parents 40d8dbf + 8a37f4f
commit 4bb2994
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
@@ -170,6 +170,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
@@ -14,12 +14,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,