[PATCH] common_logger: rely on monotonic clock

23 views
Skip to first unread message

Eric Wong

unread,
Jun 28, 2017, 10:30:58 PM6/28/17
to rack-...@googlegroups.com
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.
---
The following changes since commit 0362a54dba92626582d42f3343c209b7cdb7e713:

Partially reverting 8a7a142d (2017-06-28 13:20:52 -0700)

are available in the git repository at:

git://80x24.org/rack logger-time

for you to fetch changes up to 743f29d845b627b6083eaf6380ec6442f7427de7:

common_logger: rely on monotonic clock (2017-06-29 02:25:00 +0000)

----------------------------------------------------------------
Eric Wong (1):
common_logger: rely on monotonic clock

lib/rack/common_logger.rb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/rack/common_logger.rb b/lib/rack/common_logger.rb
index ae41043..7855f0c 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
--
EW

Rafael Mendonça França

unread,
Jul 24, 2017, 10:43:35 PM7/24/17
to Rack Development, e...@80x24.org
Thank you Eric. Sorry for the delay.

This patch was applied on master commit 3665c2437ab681148eac783e91ffb51180bcdf44.
Reply all
Reply to author
Forward
0 new messages