facter 4.0.44 → 4.0.46

data/lib/facter/framework/core/fact/internal/core_fact.rb

@@ -11,7 +11,12 @@ module Facter
 
       return unless fact_class
 
-      fact_class.new.call_the_resolver
+      fact_value = nil
+      Facter::Framework::Benchmarking::Timer.measure(@searched_fact.name) do
+        fact_value = fact_class.new.call_the_resolver
+      end
+
+      fact_value
     end
   end
 end

data/lib/facter/framework/core/fact/internal/internal_fact_manager.rb

@@ -7,7 +7,15 @@ module Facter
     def resolve_facts(searched_facts)
       internal_searched_facts = filter_internal_facts(searched_facts)
 
-      resolved_facts = resolve(internal_searched_facts)
+      resolved_facts = if Options[:sequential]
+                         @@log.debug('Resolving facts sequentially')
+                         resolve_sequentially(internal_searched_facts)
+                       else
+                         @@log.debug('Resolving fact in parallel')
+                         threads = start_threads(internal_searched_facts)
+                         join_threads(threads, internal_searched_facts)
+                       end
+
       nil_resolved_facts = resolve_nil_facts(searched_facts)
 
       resolved_facts.concat(nil_resolved_facts)
@@ -28,7 +36,7 @@ module Facter
       resolved_facts
     end
 
-    def resolve(searched_facts)
+    def resolve_sequentially(searched_facts)
       resolved_facts = []
 
       searched_facts
@@ -36,8 +44,7 @@ module Facter
         .each do |searched_fact|
         begin
           fact = CoreFact.new(searched_fact)
-          fact_value = nil
-          Facter::Framework::Benchmarking::Timer.measure(searched_fact.name) { fact_value = fact.create }
+          fact_value = fact.create
           resolved_facts << fact_value unless fact_value.nil?
         rescue StandardError => e
           @@log.log_exception(e)
@@ -47,5 +54,32 @@ module Facter
       resolved_facts.flatten!
       FactAugmenter.augment_resolved_facts(searched_facts, resolved_facts)
     end
+
+    def start_threads(searched_facts)
+      # only resolve a fact once, even if multiple search facts depend on that fact
+      searched_facts
+        .uniq { |searched_fact| searched_fact.fact_class.name }
+        .map do |searched_fact|
+        Thread.new do
+          resolve_fact(searched_fact)
+        end
+      end
+    end
+
+    def join_threads(threads, searched_facts)
+      resolved_facts = threads.map(&:value)
+      resolved_facts.compact!
+      resolved_facts.flatten!
+
+      FactAugmenter.augment_resolved_facts(searched_facts, resolved_facts)
+    end
+
+    def resolve_fact(searched_fact)
+      fact = CoreFact.new(searched_fact)
+      fact.create
+    rescue StandardError => e
+      @@log.log_exception(e)
+      nil
+    end
   end
 end

data/lib/facter/framework/core/fact_augmenter.rb

@@ -16,7 +16,7 @@ module Facter
     private_class_method def self.get_resolved_facts_for_searched_fact(searched_fact, resolved_facts)
       if searched_fact.name.include?('.*')
         resolved_facts
-          .select { |resolved_fact| resolved_fact.name.match(searched_fact.user_query) }
+          .select { |resolved_fact| resolved_fact.name.match(searched_fact.name) }
           .reject(&:user_query)
           .uniq(&:name)
       else

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -84,7 +84,7 @@ module Facter
 
       blocked_facts.each do |blocked|
         facts.each do |fact|
-          next unless fact.name =~ /^#{blocked}/
+          next unless fact.name =~ /^#{blocked}\..*|^#{blocked}$/
 
           if fact.type == :core
             reject_list_core << fact

data/lib/facter/framework/core/fact_manager.rb

@@ -27,8 +27,8 @@ module Facter
 
       resolved_facts = override_core_facts(internal_facts, external_facts)
 
-      cache_manager.cache_facts(resolved_facts)
       resolved_facts = resolved_facts.concat(cached_facts)
+      cache_manager.cache_facts(resolved_facts)
 
       FactFilter.new.filter_facts!(resolved_facts)
 

data/lib/facter/framework/core/options/config_file_options.rb

@@ -19,14 +19,18 @@ module Facter
       private
 
       def augment_all
-        if Options.cli?
-          augment_cli(Facter::ConfigReader.cli)
-          augment_ruby(Facter::ConfigReader.global)
-        end
+        augment_cli(Facter::ConfigReader.cli) if Options.cli?
+        augment_globals
+        augment_facts(Facter::ConfigReader.ttls, Facter::ConfigReader.fact_groups)
+      end
+
+      def augment_globals
+        augment_ruby(Facter::ConfigReader.global)
+
         augment_custom(Facter::ConfigReader.global)
         augment_external(Facter::ConfigReader.global)
         augment_show_legacy(Facter::ConfigReader.global)
-        augment_facts(Facter::ConfigReader.ttls, Facter::ConfigReader.fact_groups)
+        augment_sequential(Facter::ConfigReader.global)
       end
 
       def augment_config_path(config_path)
@@ -68,6 +72,7 @@ module Facter
 
       def augment_ruby(global_conf)
         return unless global_conf
+        return unless Options.cli?
 
         @options[:no_ruby] = global_conf['no-ruby'].nil? ? false : global_conf['no-ruby']
       end
@@ -78,6 +83,12 @@ module Facter
         @options[:show_legacy] = global_conf['show-legacy'] unless global_conf['show-legacy'].nil?
       end
 
+      def augment_sequential(global_conf)
+        return unless global_conf
+
+        @options[:sequential] = global_conf['sequential'] unless global_conf['sequential'].nil?
+      end
+
       def augment_facts(ttls, groups)
         fact_groups = Facter::FactGroups.new
 

data/lib/facter/framework/core/options/option_store.rb

@@ -26,6 +26,8 @@ module Facter
     @config_file_external_dir = []
     @default_external_dir = []
     @fact_groups = {}
+    @sequential = false
+    @ttls = []
     @block_list = []
     @color = true
     @trace = false
@@ -40,7 +42,7 @@ module Facter
       attr_accessor :config, :user_query, :strict, :json,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
-                    :block_list, :color, :trace, :timing
+                    :block_list, :color, :trace, :sequential, :timing
 
       attr_writer :external_dir
 
@@ -175,11 +177,11 @@ module Facter
         @ttls = []
         @block = true
         @cli = nil
+        @custom_facts = true
         reset_config
       end
 
       def reset_config
-        @custom_facts = true
         @blocked_facts = []
         @external_facts = true
         @config = nil
@@ -188,8 +190,10 @@ module Facter
         @config_file_external_dir = []
         @default_external_dir = []
         @fact_groups = {}
-        @block_list = []
+        @block_list = {}
         @color = true
+        @sequential = false
+        @ttls = []
         @trace = false
         @timing = false
         @external_dir = []

data/lib/facter/resolvers/aio_agent_version.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class AioAgentVersion < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/aix/architecture_resolver.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     class Architecture < BaseResolver
       # :architecture
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 

data/lib/facter/resolvers/aix/disks.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class Disks < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

data/lib/facter/resolvers/aix/filesystem_resolver.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class Filesystem < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

data/lib/facter/resolvers/aix/hardware_resolver.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     class Hardware < BaseResolver
       # :hardware
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 

data/lib/facter/resolvers/aix/load_averages_resolver.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class LoadAverages < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

data/lib/facter/resolvers/aix/memory.rb

@@ -4,8 +4,9 @@ module Facter
   module Resolvers
     module Aix
       class Memory < BaseResolver
+        init_resolver
         # :hardware
-        @fact_list ||= {}
+
         class << self
           private
 

data/lib/facter/resolvers/aix/mountpoints.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class Mountpoints < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         BLOCK_SIZE = 512
 
         class << self

data/lib/facter/resolvers/aix/networking_resolver.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class Networking < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

data/lib/facter/resolvers/aix/nim.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class Nim < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

data/lib/facter/resolvers/aix/os_level.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class OsLevel < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

data/lib/facter/resolvers/aix/partitions.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class Partitions < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

data/lib/facter/resolvers/aix/processors.rb

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Aix
       class Processors < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

data/lib/facter/resolvers/aix/serialnumber.rb

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Aix
       class Serialnumber < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

data/lib/facter/resolvers/augeas_resolver.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Augeas < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/base_resolver.rb

@@ -11,21 +11,28 @@ module Facter
         @fact_list = {}
       end
 
+      def self.init_resolver
+        @fact_list = {}
+        @semaphore = Mutex.new
+      end
+
       def self.subscribe_to_manager
         Facter::SessionCache.subscribe(self)
       end
 
       def self.resolve(fact_name)
-        subscribe_to_manager
-        post_resolve(fact_name)
+        @semaphore.synchronize do
+          subscribe_to_manager
+          post_resolve(fact_name)
 
-        validate_resolution(fact_name)
+          cache_nil_for_unresolved_facts(fact_name)
+        end
       rescue LoadError, NameError => e
         log.debug("resolving fact #{fact_name}, but #{e}")
         @fact_list[fact_name] = nil
       end
 
-      def self.validate_resolution(fact_name)
+      def self.cache_nil_for_unresolved_facts(fact_name)
         @fact_list.fetch(fact_name) { @fact_list[fact_name] = nil }
         @fact_list[fact_name]
       end

data/lib/facter/resolvers/bsd/processors.rb

@@ -4,8 +4,9 @@ module Facter
   module Resolvers
     module Bsd
       class Processors < BaseResolver
+        init_resolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
         class << self
           private
 

data/lib/facter/resolvers/cloud.rb

@@ -5,7 +5,7 @@ module Facter
     class Cloud < BaseResolver
       # cloud_provider
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/containers.rb

@@ -6,7 +6,8 @@ module Facter
       # :virtual
       # :hypervisor
 
-      @fact_list ||= {}
+      init_resolver
+
       INFO = { 'docker' => 'id', 'lxc' => 'name' }.freeze
 
       class << self

data/lib/facter/resolvers/debian_version.rb

@@ -7,7 +7,7 @@ module Facter
       # :minor
       # :full
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/disk_resolver.rb

@@ -5,9 +5,12 @@ module Facter
     module Linux
       class Disk < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        init_resolver
+
         DIR = '/sys/block'
         FILE_PATHS = { model: 'device/model', size: 'size', vendor: 'device/vendor', type: 'queue/rotational' }.freeze
+
         class << self
           private