From: Eric Wong <e@80x24.org>
To: clogger-public@bogomips.org
Subject: [PATCH 1/2] pure: fix reentrancy of request_time
Date: Fri, 27 Feb 2015 22:45:06 +0000 [thread overview]
Message-ID: <1425077107-25270-2-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1425077107-25270-1-git-send-email-e@80x24.org>
For users unable to compile the C extension, multithreaded usage
of clogger could return invalid request time measurements.
This does not affect users of the C extension.
---
lib/clogger/pure.rb | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/lib/clogger/pure.rb b/lib/clogger/pure.rb
index bb3fc16..9efb00c 100644
--- a/lib/clogger/pure.rb
+++ b/lib/clogger/pure.rb
@@ -6,7 +6,7 @@
class Clogger
attr_accessor :env, :status, :headers, :body
- attr_writer :body_bytes_sent
+ attr_writer :body_bytes_sent, :start
def initialize(app, opts = {})
# trigger autoload to avoid thread-safety issues later on
@@ -28,10 +28,10 @@ def initialize(app, opts = {})
end
def call(env)
- @start = Time.now
+ start = Time.now
resp = @app.call(env)
unless resp.instance_of?(Array) && resp.size == 3
- log(env, 500, {})
+ log(env, 500, {}, start)
raise TypeError, "app response not a 3 element Array: #{resp.inspect}"
end
status, headers, body = resp
@@ -39,13 +39,14 @@ def call(env)
if @wrap_body
@reentrant = env['rack.multithread'] if @reentrant.nil?
wbody = @reentrant ? self.dup : self
+ wbody.start = start
wbody.env = env
wbody.status = status
wbody.headers = headers
wbody.body = body
return [ status, headers, wbody ]
end
- log(env, status, headers)
+ log(env, status, headers, start)
[ status, headers, body ]
end
@@ -60,8 +61,8 @@ def each
def close
@body.close if @body.respond_to?(:close)
- ensure
- log(@env, @status, @headers)
+ ensure
+ log(@env, @status, @headers)
end
def reentrant?
@@ -153,7 +154,7 @@ def time_format(sec, usec, format, div)
format % [ sec, usec / div ]
end
- def log(env, status, headers)
+ def log(env, status, headers, start = @start)
str = @fmt_ops.map { |op|
case op[0]
when OP_LITERAL; op[1]
@@ -164,7 +165,7 @@ def log(env, status, headers)
when OP_TIME_LOCAL; Time.now.strftime(op[1])
when OP_TIME_UTC; Time.now.utc.strftime(op[1])
when OP_REQUEST_TIME
- t = Time.now - @start
+ t = Time.now - start
time_format(t.to_i, (t - t.to_i) * 1000000, op[1], op[2])
when OP_TIME
t = Time.now
--
EW
next prev parent reply other threads:[~2015-02-27 22:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-27 22:45 [PATCH 0/2] fixes for pure-Ruby users Eric Wong
2015-02-27 22:45 ` Eric Wong [this message]
2015-02-27 22:45 ` [PATCH 2/2] pure: use monotonic clock if possible Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/clogger/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425077107-25270-2-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=clogger-public@bogomips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/clogger.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).