lib/deas/logging.rb in deas-0.37.0 vs lib/deas/logging.rb in deas-0.37.1

- old
+ new

@@ -39,11 +39,11 @@ status, headers, body = @app.call(env) end log_error(env['sinatra.error']) env['deas.time_taken'] = RoundedTime.new(benchmark.real) - [ status, headers, body ] + [status, headers, body] end def log(message) @logger.info "[Deas] #{message}" end @@ -79,15 +79,15 @@ end env['deas.logging'] = Proc.new{ |msg| log(msg) } status, headers, body = super(env) log " Redir: #{headers['Location']}" if headers.key?('Location') log "===== Completed in #{env['deas.time_taken']}ms (#{response_display(status)}) =====" - [ status, headers, body ] + [status, headers, body] end def response_display(status) - [ status, RESPONSE_STATUS_NAMES[status.to_i] ].compact.join(', ') + [status, RESPONSE_STATUS_NAMES[status.to_i]].compact.join(', ') end end class SummaryLogging < BaseLogging @@ -99,19 +99,21 @@ status, headers, body = super(env) request = Rack::Request.new(env) line_attrs = { 'method' => request.request_method, 'path' => request.path, - 'handler' => env['deas.handler_class'].name, 'params' => env['deas.params'], 'time' => env['deas.time_taken'], 'status' => status } + if env['deas.handler_class'] + line_attrs['handler'] = env['deas.handler_class'].name + end if headers.key?('Location') line_attrs['redir'] = headers['Location'] end log SummaryLine.new(line_attrs) - [ status, headers, body ] + [status, headers, body] end end module SummaryLine