From f8e0658a4d3a593d4d9d40d6eb156f97cb13cbbe Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 8 Mar 2016 12:11:15 +0100 Subject: [PATCH 1/3] Small code lisibility simplifications --- lib/grape_logging/loggers/filter_parameters.rb | 9 ++++----- lib/grape_logging/middleware/request_logger.rb | 6 +----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/grape_logging/loggers/filter_parameters.rb b/lib/grape_logging/loggers/filter_parameters.rb index c7942e1..83d612d 100644 --- a/lib/grape_logging/loggers/filter_parameters.rb +++ b/lib/grape_logging/loggers/filter_parameters.rb @@ -12,13 +12,12 @@ module GrapeLogging private def replace_parameters(parameters) - parameters.tap do |parameters| - @filter_parameters.each do |parameter_name| - if parameters.key?(parameter_name.to_s) - parameters[parameter_name.to_s] = @replacement - end + @filter_parameters.each do |parameter_name| + if parameters.key?(parameter_name.to_s) + parameters[parameter_name.to_s] = @replacement end end + parameters end end end diff --git a/lib/grape_logging/middleware/request_logger.rb b/lib/grape_logging/middleware/request_logger.rb index 41cecc9..f6cd65a 100644 --- a/lib/grape_logging/middleware/request_logger.rb +++ b/lib/grape_logging/middleware/request_logger.rb @@ -29,12 +29,8 @@ module GrapeLogging def after stop_time - - params = collect_parameters - @reporter.perform(params) - + @reporter.perform(collect_parameters) invoke_included_loggers(:after) - nil end From 933424cabf6f332c26dca844f0080f4b26953db4 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 15 Mar 2016 15:28:51 +0100 Subject: [PATCH 2/3] .formatter method does not exist in some Logger implementations --- lib/grape_logging/reporters/logger_reporter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/grape_logging/reporters/logger_reporter.rb b/lib/grape_logging/reporters/logger_reporter.rb index b0631a6..2b87b0f 100644 --- a/lib/grape_logging/reporters/logger_reporter.rb +++ b/lib/grape_logging/reporters/logger_reporter.rb @@ -2,7 +2,7 @@ module Reporters class LoggerReporter def initialize(logger, formatter) @logger = logger || Logger.new(STDOUT) - @logger.formatter = formatter || GrapeLogging::Formatters::Default.new + @logger.formatter = formatter || GrapeLogging::Formatters::Default.new if @logger.respond_to?(:formatter) end def perform(params) From ed42e77eaac727d4ec96e17f49451e2b1dd59e4b Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 15 Mar 2016 15:30:15 +0100 Subject: [PATCH 3/3] .formatter= method does not exist in some Logger implementations --- lib/grape_logging/reporters/logger_reporter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/grape_logging/reporters/logger_reporter.rb b/lib/grape_logging/reporters/logger_reporter.rb index 2b87b0f..c5620d4 100644 --- a/lib/grape_logging/reporters/logger_reporter.rb +++ b/lib/grape_logging/reporters/logger_reporter.rb @@ -2,7 +2,7 @@ module Reporters class LoggerReporter def initialize(logger, formatter) @logger = logger || Logger.new(STDOUT) - @logger.formatter = formatter || GrapeLogging::Formatters::Default.new if @logger.respond_to?(:formatter) + @logger.formatter = formatter || GrapeLogging::Formatters::Default.new if @logger.respond_to?(:formatter=) end def perform(params)