Only explicitly initialize a logger when needed

When we're running Ohai as a standalone application, we need to fire up the logger with our desired location, but when we're run from inside Chef, we're passed the client's loggers. Signed-off-by: Thom May <[email protected]>
chef · Jan 20, 2017 · 3327203 · 3327203
1 parent 60c7fd2
commit 3327203
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/lib/ohai/application.rb b/lib/ohai/application.rb
@@ -83,6 +83,8 @@ def configure_ohai
     @attributes = nil if @attributes.empty?
 
     load_workstation_config
+
+    Ohai::Log.init(Ohai.config[:log_location])
   end
 
   def run_application

diff --git a/lib/ohai/system.rb b/lib/ohai/system.rb
@@ -220,10 +220,6 @@ def configure_ohai
     end
 
     def configure_logging
-      return if Ohai::Log.configured?
-
-      Ohai::Log.init(Ohai.config[:log_location])
-
       if Ohai.config[:log_level] == :auto
         Ohai::Log.level = :info
       else

diff --git a/spec/unit/system_spec.rb b/spec/unit/system_spec.rb
@@ -101,7 +101,6 @@
       it "configures logging" do
         log_level = :debug
         Ohai.config[:log_level] = log_level
-        expect(Ohai::Log).to receive(:init).with(Ohai.config[:log_location])
         expect(Ohai::Log).to receive(:level=).with(log_level)
         Ohai::System.new
       end