Skip to content

Commit 22ba8e0

Browse files
authored
Merge pull request #57 from saidie/fix/level_logger_severity_format
Implement standard compatible severity formatting to LevelFluentLogger
2 parents d278e03 + 1750fcd commit 22ba8e0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ require 'fluent-logger'
8484
f = Fluent::Logger::LevelFluentLogger.new('fluent')
8585

8686
f.formatter = proc do |severity, datetime, progname, message|
87-
map = { level: severity.class == Fixnum ? %w(DEBUG INFO WARN ERROR FATAL ANY)[severity] : severity }
87+
map = { level: severity }
8888
map[:message] = message if message
8989
map[:progname] = progname if progname
9090
map[:stage] = ENV['RAILS_ENV']

lib/fluent/logger/level_fluent_logger.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class LevelFluentLogger < ::Logger
2828
def initialize(tag_prefix = nil, *args)
2929
@level = ::Logger::DEBUG
3030
@default_formatter = proc do |severity, datetime, progname, message|
31-
map = { level: format_severity(severity) }
31+
map = { level: severity }
3232
map[:message] = message if message
3333
map[:progname] = progname if progname
3434
map
@@ -50,7 +50,7 @@ def add(severity, message = nil, progname = nil, &block)
5050
progname = @progname
5151
end
5252
end
53-
map = format_message(severity, Time.now, progname, message)
53+
map = format_message(format_severity(severity), Time.now, progname, message)
5454
@fluent_logger.post(format_severity(severity).downcase, map)
5555
true
5656
end

spec/level_fluent_logger_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
it ('define formatter') {
146146
level_logger.level = ::Logger::DEBUG
147147
level_logger.formatter = proc do |severity, datetime, progname, message|
148-
map = { level: severity.class == Fixnum ? %w(DEBUG INFO WARN ERROR FATAL ANY)[severity] : severity }
148+
map = { level: severity }
149149
map[:message] = message if message
150150
map[:progname] = progname if progname
151151
map[:stage] = "development"

0 commit comments

Comments
 (0)