From 5568123593638b2963a6f85e981ffb276431046d Mon Sep 17 00:00:00 2001 From: Hiroshi Saito Date: Mon, 14 Nov 2016 20:17:20 +0900 Subject: [PATCH 1/3] Apply format_severity before passing to formatter --- lib/fluent/logger/level_fluent_logger.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fluent/logger/level_fluent_logger.rb b/lib/fluent/logger/level_fluent_logger.rb index ce1858f..dd69b5a 100644 --- 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 From 04bcbdd59913fda79e5880c0d936c9a1e67b8e1c Mon Sep 17 00:00:00 2001 From: Hiroshi Saito Date: Tue, 15 Nov 2016 14:14:29 +0900 Subject: [PATCH 2/3] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 238c859..cdf338f 100644 --- 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'] From 1750fcd3ae46ff3d319ecb079cb886316500177f Mon Sep 17 00:00:00 2001 From: Hiroshi Saito Date: Tue, 15 Nov 2016 15:15:55 +0900 Subject: [PATCH 3/3] Update a formatter spec of LevelFluentLogger --- spec/level_fluent_logger_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/level_fluent_logger_spec.rb b/spec/level_fluent_logger_spec.rb index 1da0bee..37d3b90 100644 --- 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"