fix labellingtm/fix_labels

Signed-off-by: Thom May <thom@chef.io>

3 files changed, 14 insertions, 3 deletions

diff --git a/lib/mixlib/log.rb b/lib/mixlib/log.rb
index cd219ae..b2d765a 100644
--- a/lib/mixlib/log.rb
+++ b/lib/mixlib/log.rb
@@ -21,6 +21,7 @@ require "mixlib/log/version"
 require "mixlib/log/formatter"
 require "mixlib/log/child"
 require "mixlib/log/logging"
+require "mixlib/log/logger"
 
 module Mixlib
   module Log
@@ -169,11 +170,11 @@ module Mixlib
 
     def logger_for(*opts)
       if opts.empty?
-        Logger.new(STDOUT)
+        Mixlib::Log::Logger.new(STDOUT)
       elsif LEVELS.keys.inject(true) { |quacks, level| quacks && opts.first.respond_to?(level) }
         opts.first
       else
-        Logger.new(*opts)
+        Mixlib::Log::Logger.new(*opts)
       end
     end
 
diff --git a/lib/mixlib/log/logger.rb b/lib/mixlib/log/logger.rb
index e124b7f..f92d4a2 100644
--- a/lib/mixlib/log/logger.rb
+++ b/lib/mixlib/log/logger.rb
@@ -52,7 +52,7 @@ module Mixlib
           data[:msg] = message
         end
         @logdev.write(
-          format_message(format_severity(severity), Time.now, progname, data))
+          format_message(to_label(severity), Time.now, progname, data))
         true
       end
       alias_method :add, :add_data
diff --git a/spec/mixlib/log_spec.rb b/spec/mixlib/log_spec.rb
index d96c29d..7285abc 100644
--- a/spec/mixlib/log_spec.rb
+++ b/spec/mixlib/log_spec.rb
@@ -221,4 +221,14 @@ RSpec.describe Mixlib::Log do
     expect(Logit.metadata).to eql({ test: "data" })
   end
 
+  it "should format :trace level messages with TRACE: label" do
+    logdev = StringIO.new
+    Logit.init(logdev)
+    Logit.level = :trace
+    Logit.trace("this is a log message")
+    aggregate_failures do
+      expect(logdev.string).to_not match(/ANY:/)
+      expect(logdev.string).to match(/TRACE:/)
+    end
+  end
 end