diff options
Diffstat (limited to 'lib/rack/common_logger.rb')
-rw-r--r-- | lib/rack/common_logger.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/rack/common_logger.rb b/lib/rack/common_logger.rb index ae410430..692b2070 100644 --- a/lib/rack/common_logger.rb +++ b/lib/rack/common_logger.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rack/body_proxy' module Rack @@ -23,13 +25,13 @@ module Rack # %{%s - %s [%s] "%s %s%s %s" %d %s\n} % FORMAT = %{%s - %s [%s] "%s %s%s %s" %d %s %0.4f\n} - def initialize(app, logger=nil) + def initialize(app, logger = nil) @app = app @logger = logger end def call(env) - began_at = Time.now + began_at = Utils.clock_time status, header, body = @app.call(env) header = Utils::HeaderHash.new(header) body = BodyProxy.new(body) { log(env, status, header, began_at) } @@ -39,20 +41,19 @@ module Rack private def log(env, status, header, began_at) - now = Time.now length = extract_content_length(header) msg = FORMAT % [ env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-", env["REMOTE_USER"] || "-", - now.strftime("%d/%b/%Y:%H:%M:%S %z"), + Time.now.strftime("%d/%b/%Y:%H:%M:%S %z"), env[REQUEST_METHOD], env[PATH_INFO], env[QUERY_STRING].empty? ? "" : "?#{env[QUERY_STRING]}", env[HTTP_VERSION], status.to_s[0..3], length, - now - began_at ] + Utils.clock_time - began_at ] logger = @logger || env[RACK_ERRORS] # Standard library logger doesn't support write but it supports << which actually @@ -65,8 +66,8 @@ module Rack end def extract_content_length(headers) - value = headers[CONTENT_LENGTH] or return '-' - value.to_s == '0' ? '-' : value + value = headers[CONTENT_LENGTH] + !value || value.to_s == '0' ? '-' : value end end end |