Add debug logging when looking for hints

1 files changed, 18 insertions, 14 deletions

diff --git a/lib/ohai/hints.rb b/lib/ohai/hints.rb
index 20420856..a4d18adc 100644
--- a/lib/ohai/hints.rb
+++ b/lib/ohai/hints.rb
@@ -22,28 +22,32 @@ require "ffi_yajl"
 module Ohai
   module Hints
     def self.refresh_hints
-      @hints = Hash.new
+      @hints = {}
+    end
+
+    def self.parse_hint_file(filename)
+      begin
+        json_parser = FFI_Yajl::Parser.new
+        hash = json_parser.parse(File.read(filename))
+        hash || {} # hint
+        # should exist because the file did, even if it didn't
+        # contain anything
+      rescue FFI_Yajl::ParseError => e
+        Ohai::Log.error("Plugin #{self.name}: Could not parse hint file at #{filename}: #{e.message}")
+      end
     end
 
     def self.hint?(name)
-      @hints ||= Hash.new
+      @hints ||= {}
       return @hints[name] if @hints[name]
-
       Ohai.config[:hints_path].each do |path|
         filename = File.join(path, "#{name}.json")
-        if File.exist?(filename)
-          begin
-            json_parser = FFI_Yajl::Parser.new
-            hash = json_parser.parse(File.read(filename))
-            @hints[name] = hash || Hash.new # hint
-            # should exist because the file did, even if it didn't
-            # contain anything
-          rescue FFI_Yajl::ParseError => e
-            Ohai::Log.error("Could not parse hint file at #{filename}: #{e.message}")
-          end
-        end
+        next unless File.exist?(filename)
+        Ohai::Log.debug("Found hint #{name}.json at #{filename}")
+        @hints[name] = parse_hint_file(filename)
       end
 
+      Ohai::Log.debug("Did not find hint #{name}.json in the hint path(s): #{Ohai.config[:hints_path].join(',')} ") unless @hints.key?(name)
       @hints[name]
     end
   end