Merge pull request #57 from saidie/fix/level_logger_severity_format

Implement standard compatible severity formatting to LevelFluentLogger
fluent · Jan 16, 2017 · 22ba8e0 · 22ba8e0
2 parents d278e03 + 1750fcd
commit 22ba8e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ require 'fluent-logger'
 f = Fluent::Logger::LevelFluentLogger.new('fluent')
 
 f.formatter = proc do |severity, datetime, progname, message|
-  map = { level: severity.class == Fixnum ? %w(DEBUG INFO WARN ERROR FATAL ANY)[severity] : severity }
+  map = { level: severity }
   map[:message] = message if message
   map[:progname] = progname if progname
   map[:stage] = ENV['RAILS_ENV']

diff --git a/lib/fluent/logger/level_fluent_logger.rb b/lib/fluent/logger/level_fluent_logger.rb
@@ -28,7 +28,7 @@ class LevelFluentLogger < ::Logger
       def initialize(tag_prefix = nil, *args)
         @level = ::Logger::DEBUG
         @default_formatter = proc do |severity, datetime, progname, message|
-          map = { level: format_severity(severity) }
+          map = { level: severity }
           map[:message] = message if message
           map[:progname] = progname if progname
           map
@@ -50,7 +50,7 @@ def add(severity, message = nil, progname = nil, &block)
             progname = @progname
           end
         end
-        map = format_message(severity, Time.now, progname, message)
+        map = format_message(format_severity(severity), Time.now, progname, message)
         @fluent_logger.post(format_severity(severity).downcase, map)
         true
       end

diff --git a/spec/level_fluent_logger_spec.rb b/spec/level_fluent_logger_spec.rb
@@ -145,7 +145,7 @@
       it ('define formatter') {
         level_logger.level = ::Logger::DEBUG
         level_logger.formatter = proc do |severity, datetime, progname, message|
-          map = { level: severity.class == Fixnum ? %w(DEBUG INFO WARN ERROR FATAL ANY)[severity] : severity }
+          map = { level: severity }
           map[:message] = message if message
           map[:progname] = progname if progname
           map[:stage] = "development"