Code quality

This commit is contained in:
jules 2015-10-23 17:19:06 +02:00
parent 6c0fdeca64
commit 4115e6383b
2 changed files with 8 additions and 5 deletions

View file

@ -3,12 +3,17 @@ module GrapeLogging
class DatabaseTime < GrapeLogging::Loggers::Base class DatabaseTime < GrapeLogging::Loggers::Base
def before def before
@duration = 0 @duration = 0
ActiveSupport::Notifications.subscribe('sql.active_record') do |*args| @subscription = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
event = ActiveSupport::Notifications::Event.new(*args) event = ActiveSupport::Notifications::Event.new(*args)
@duration += event.duration @duration += event.duration
end end
end end
def after
ensure
ActiveSupport::Notifications.unsubscribe(@subscription) if @subscription
end
def parameters(request, response) def parameters(request, response)
{ {
time: { time: {

View file

@ -22,7 +22,7 @@ module GrapeLogging
def after def after
stop_time stop_time
parameters = parameters(request, response) parameters = get_parameters
@included_loggers.each do |included_logger| @included_loggers.each do |included_logger|
parameters.merge! included_logger.parameters(request, response) do |key, oldval, newval| parameters.merge! included_logger.parameters(request, response) do |key, oldval, newval|
oldval.respond_to?(:merge) ? oldval.merge(newval) : newval oldval.respond_to?(:merge) ? oldval.merge(newval) : newval
@ -38,12 +38,10 @@ module GrapeLogging
def call!(env) def call!(env)
super super
ensure
ActiveSupport::Notifications.unsubscribe(@subscription) if @subscription
end end
protected protected
def parameters(request, response) def get_parameters
{ {
status: response.status, status: response.status,
time: { time: {