Fixes #11294: Prevent top level constant warning from Logging.

The warning "warning: toplevel constant Logging referenced by Katello::Foreman::Logging" appears many times throughout test runs.
Katello · Aug 5, 2015 · 20c9d8e · 20c9d8e
1 parent 39646f8
commit 20c9d8e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb b/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb
@@ -418,7 +418,7 @@ def system_params
     end
 
     def logger
-      Foreman::Logging.logger('katello/cp_proxy')
+      ::Foreman::Logging.logger('katello/cp_proxy')
     end
 
     def respond_for_index(options = {})

diff --git a/app/lib/katello/resources/candlepin.rb b/app/lib/katello/resources/candlepin.rb
@@ -6,7 +6,7 @@ module Resources
     module Candlepin
       class Proxy
         def self.logger
-          Foreman::Logging.logger('katello/cp_proxy')
+          ::Foreman::Logging.logger('katello/cp_proxy')
         end
 
         def self.post(path, body)
@@ -50,7 +50,7 @@ class CandlepinResource < HttpResource
         self.ca_cert_file = cfg.ca_cert_file
 
         def self.logger
-          Foreman::Logging.logger('katello/cp_rest')
+          ::Foreman::Logging.logger('katello/cp_rest')
         end
 
         def self.default_headers(uuid = nil)
@@ -284,7 +284,7 @@ def update_content_override(id, content_label, name, value = nil)
 
       class UpstreamConsumer < HttpResource
         def self.logger
-          Foreman::Logging.logger('katello/cp_rest')
+          ::Foreman::Logging.logger('katello/cp_rest')
         end
 
         def self.resource(url, client_cert, client_key, ca_file)

diff --git a/app/models/katello/glue.rb b/app/models/katello/glue.rb
@@ -2,7 +2,7 @@ module Katello
   module Glue
     singleton_class.send :attr_writer, :logger
     def self.logger
-      @logger ||= Foreman::Logging.logger('katello/glue')
+      @logger ||= ::Foreman::Logging.logger('katello/glue')
     end
 
     def self.included(base)

diff --git a/app/models/katello/glue/provider.rb b/app/models/katello/glue/provider.rb
@@ -198,7 +198,7 @@ def owner_imports
       end
 
       def import_logger
-        Foreman::Logging.logger('katello/manifest_import_logger')
+        ::Foreman::Logging.logger('katello/manifest_import_logger')
       end
 
       # TODO: break up method

diff --git a/lib/katello/engine.rb b/lib/katello/engine.rb
@@ -148,7 +148,7 @@ class Engine < ::Rails::Engine
       require 'katello/permissions'
 
       Tire::Configuration.url(Katello.config.elastic_url)
-      bridge = Katello::TireBridge.new(Foreman::Logging.logger('katello/tire_rest'))
+      bridge = Katello::TireBridge.new(::Foreman::Logging.logger('katello/tire_rest'))
       Tire.configure { logger bridge, :level => bridge.level }
     end