Merge branch 'tm/fix_app_logging'

3 files changed, 2 insertions, 5 deletions

diff --git a/lib/ohai/application.rb b/lib/ohai/application.rb
index 0b0327e7..9f1c400f 100644
--- a/lib/ohai/application.rb
+++ b/lib/ohai/application.rb
@@ -83,6 +83,8 @@ class Ohai::Application
     @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
index c55383ca..01ee6463 100644
--- a/lib/ohai/system.rb
+++ b/lib/ohai/system.rb
@@ -220,10 +220,6 @@ module 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
index 0144ff61..11bec51c 100644
--- a/spec/unit/system_spec.rb
+++ b/spec/unit/system_spec.rb
@@ -101,7 +101,6 @@ describe "Ohai::System" do
       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