(FACT-3468) Create Log instance in the base resolver's init_resolver method

Previously, some resolvers eagerly created a Log, while others relied on the
BaseResolver to lazily create it.

Now eagerly create the Log in the BaseResolver's init_resolver method, which all
derived resolvers already call. This preserves the behavior where the derived class'
name is printed in the log message:

    DEBUG Facter::Resolvers::LsbRelease - Command lsb_release ...

This is because `Log.new(self)` refers to the derived resolver class, e.g.
Facter::Resolvers::LsbRelease, not the BaseResolver.

The base_resolver_spec tests were modified because they were testing that
Facter::Log.new was called a certain way. Instead test the behavior that
`BaseResolver.log` method returns an instance of Facter::Log and calling the
method multiple times returns the same object.

Author: joshcooper

lib/facter/resolvers/base_resolver.rb

@@ -3,8 +3,8 @@
 module Facter
   module Resolvers
     class BaseResolver
-      def self.log
-        @log ||= Log.new(self)
+      class << self
+        attr_reader :log
       end
 
       def self.invalidate_cache
@@ -14,6 +14,7 @@ def self.invalidate_cache
       def self.init_resolver
         @fact_list = {}
         @semaphore = Mutex.new
+        @log = Log.new(self)
       end
 
       def self.subscribe_to_manager

lib/facter/resolvers/bsd/processors.rb

@@ -5,7 +5,6 @@ module Resolvers
     module Bsd
       class Processors < BaseResolver
         init_resolver
-        @log = Facter::Log.new(self)
 
         class << self
           private

lib/facter/resolvers/disks.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class Disks < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         DIR = '/sys/block'

lib/facter/resolvers/dmi.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class DmiBios < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         class << self

lib/facter/resolvers/filesystems.rb

@@ -8,8 +8,6 @@ class Filesystems < BaseResolver
 
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

lib/facter/resolvers/fips_enabled.rb

@@ -8,8 +8,6 @@ class FipsEnabled < BaseResolver
 
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

lib/facter/resolvers/freebsd/processors.rb

@@ -7,7 +7,6 @@ module Resolvers
     module Freebsd
       class Processors < BaseResolver
         init_resolver
-        @log = Facter::Log.new(self)
 
         class << self
           private

lib/facter/resolvers/identity.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class PosxIdentity < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

lib/facter/resolvers/macosx/mountpoints.rb

@@ -7,8 +7,6 @@ class Mountpoints < BaseResolver
         include Facter::Util::Resolvers::FilesystemHelper
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

lib/facter/resolvers/memory.rb

@@ -6,8 +6,6 @@ module Linux
       class Memory < BaseResolver
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

lib/facter/resolvers/mountpoints.rb

@@ -7,8 +7,6 @@ class Mountpoints < BaseResolver
 
       init_resolver
 
-      @log = Facter::Log.new(self)
-
       class << self
         private
 

lib/facter/resolvers/processors.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class Processors < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         MHZ_TO_HZ = 1_000_000

lib/facter/resolvers/solaris/mountpoints.rb

@@ -7,8 +7,6 @@ class Mountpoints < BaseResolver
         include Facter::Util::Resolvers::FilesystemHelper
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

lib/facter/resolvers/solaris/networking.rb

@@ -6,7 +6,6 @@ module Resolvers
     module Solaris
       class Networking < BaseResolver
         init_resolver
-        @log = Facter::Log.new(self)
 
         class << self
           private

lib/facter/resolvers/ssh.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class Ssh < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       FILE_NAMES = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub].freeze

lib/facter/resolvers/uname.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class Uname < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

lib/facter/resolvers/windows/dmi_bios.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class DMIBios < BaseResolver
-      @log = Facter::Log.new(self)
       init_resolver
 
       class << self

lib/facter/resolvers/windows/dmi_computersystem.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class DMIComputerSystem < BaseResolver
-      @log = Facter::Log.new(self)
       init_resolver
 
       class << self

lib/facter/resolvers/windows/hardware_architecture.rb

@@ -24,7 +24,6 @@ def read_hardware_information(fact_name)
           build_facts_list(hardware: hard, architecture: arch)
           @fact_list[fact_name]
         rescue LoadError => e
-          log = Facter::Log.new(self)
           log.debug("The ffi gem has not been installed: #{e}")
         end
 

lib/facter/resolvers/windows/identity.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Identity < BaseResolver
       NAME_SAM_COMPATIBLE = 2
-      @log = Facter::Log.new(self)
 
       init_resolver
 

lib/facter/resolvers/windows/kernel.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class Kernel < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

lib/facter/resolvers/windows/memory.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class Memory < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

lib/facter/resolvers/windows/networking.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Windows
       class Networking < BaseResolver
-        @log = Facter::Log.new(self)
         init_resolver
 
         class << self

lib/facter/resolvers/windows/ssh.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Windows
       class Ssh < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         FILE_NAMES = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub

lib/facter/resolvers/windows/system32.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class System32 < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

lib/facter/resolvers/windows/timezone.rb

@@ -34,7 +34,6 @@ def codepage_from_api
             require_relative '../../../facter/resolvers/windows/ffi/winnls_ffi'
             WinnlsFFI.GetACP.to_s
           rescue LoadError => e
-            log = Facter::Log.new(self)
             log.debug("Could not retrieve codepage: #{e}")
           end
         end

lib/facter/resolvers/windows/uptime.rb

@@ -6,8 +6,6 @@ module Facter
   module Resolvers
     module Windows
       class Uptime < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         class << self

lib/facter/resolvers/windows/virtualization.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Windows
       class Virtualization < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         class << self

lib/facter/resolvers/windows/win_os_description.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class WinOsDescription < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

spec/facter/resolvers/base_resolver_spec.rb

@@ -14,21 +14,12 @@ def self.post_resolve(fact_name, _options)
   end
 
   describe '#log' do
-    before do
-      allow(Facter::Log).to receive(:new).with(resolver).and_return('logger')
+    it 'returns the log' do
+      expect(resolver.log).to be_an_instance_of(Facter::Log)
     end
 
-    it 'initializes the log' do
-      resolver.log
-
-      expect(Facter::Log).to have_received(:new).with(resolver)
-    end
-
-    it 'initializes the log only once' do
-      resolver.log
-      resolver.log
-
-      expect(Facter::Log).to have_received(:new).with(resolver).once
+    it 'returns the same log instance each time' do
+      expect(resolver.log).to be_equal(resolver.log)
     end
   end
 
@@ -77,13 +68,12 @@ def self.post_resolve(fact_name, _options)
     context 'when Load Error is raised' do
       before do
         allow(resolver).to receive(:post_resolve).and_raise(LoadError)
-        allow(Facter::Log).to receive(:new).with(resolver).and_return(instance_double(Facter::Log, error: nil))
       end
 
       it 'logs the Load Error exception at the error level' do
-        resolver.resolve(fact)
+        expect(resolver.log).to receive(:error).with(/Resolving fact #{fact}, but got LoadError/)
 
-        expect(resolver.log).to have_received(:error).with(/Resolving fact #{fact}, but got LoadError/)
+        resolver.resolve(fact)
       end
 
       it 'sets the fact to nil' do