diff options
| author | Eric Wong <e@80x24.org> | 2017-06-29 02:25:00 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2017-06-29 02:25:00 +0000 |
| commit | 743f29d845b627b6083eaf6380ec6442f7427de7 (patch) | |
| tree | 69c15506616fdd6e9a7e50e5a8c9b30d2383496b | |
| parent | 0362a54dba92626582d42f3343c209b7cdb7e713 (diff) | |
| download | rack-logger-time.tar.gz | |
common_logger: rely on monotonic clock logger-time
As with commit 2474e3a779a8d2b6 for Rack::Runtime, Time.now is inaccurate if system time changes, so do not rely on it if a monotonic clock is available.
| -rw-r--r-- | lib/rack/common_logger.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/rack/common_logger.rb b/lib/rack/common_logger.rb index ae410430..7855f0c3 100644 --- a/lib/rack/common_logger.rb +++ b/lib/rack/common_logger.rb @@ -29,7 +29,7 @@ module Rack 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 +39,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 |