Joel Watson <joel at watsonian.net> wrote:> Hey all,
>
> Below is a proposed patch I worked on over the weekend. Just adding a
> note here to mention that I''m currently not a subscriber to the
> mailing list, so please CC me on any replies. Let me know what you all
> think. This change was made on a local topic branch off of the maint
> branch. If you''d like to view the change on GitHub, you can do so
> here: http://github.com/watsonian/unicorn/compare/maint...siginfo
>
> -Joel
> ===============================> >From
a0ccb9efe508d4bd0a2a238305fedcbfc051d202 Mon Sep 17 00:00:00 2001
> From: watsonian <watsonian at gmail.com>
> Date: Mon, 26 Apr 2010 18:25:02 -0700
> Subject: [PATCH] Add worker interrogation via INFO signals
>
> You can now send a worker an INFO signal and it will write the
> current request uri it''s processing and how long it''s
been processing
> it for to the log. Sending the master process an INFO signal will
> send all workers an INFO signal as well.
>
> This addresses cases where it''s desirable to know exactly what a
> worker is doing at a particular point in time (e.g., if it''s
hanging
> on a particular request such that it isn''t writing out to log
files).
> ---
> lib/unicorn.rb | 25 ++++++++++++++++++++-----
> 1 files changed, 20 insertions(+), 5 deletions(-)
Hi Joel,
I''m alright with most of the changes, but I''m not ready to put
more
things into every single request that people cannot opt-out of.
Since this data is written in a way that most users will rarely access,
I would avoid the changes to process_client:
> # once a client is accepted, it is processed in its entirety here
> # in 3 easy steps: read request, call app, write app response
> - def process_client(client)
> + def process_client(client, worker)
> client.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
> - response = app.call(env = REQUEST.read(client))
> + env = REQUEST.read(client)
> + worker.request_start = Time.now.to_i
> + worker.request_uri = env["REQUEST_URI"]
> + response = app.call(env)
And instead do it as middleware which requires opting in:
# XXX Totally untested code written at ~1:30 AM, may not even compile
# this middleware is only useful for Unicorn
module Unicorn
class Info < Struct.new(:app, :body)
TIME_KEY = "unicorn.info_time".freeze
# +env+ passed is always Unicorn::HttpRequest::REQ when used with Unicorn
def call(env)
env[TIME_KEY] = Time.now.to_i
status, headers, self.body = app.call(env)
end
# this is a no-op proxy method, we only have this so we can
# wrap the "close" method later on...
def each(&block)
body.each(&block)
end
# http_response.rb will call this in an ensure statement,
# we''ll finalize our per-request data here
def close
# Unicorn has only a single env hash to pass to Rack that always
# gets reused across requests, this micro-optimization makes it
# less likely to require expensive rehashing/resizing every
# request. Normally Unicorn will wait until the start of the next
# request to clear this.
HttpRequest::REQ.clear[TIME_KEY] = Time.now.to_i
body.close if body.respond_to?(:close)
end
end # class Info
end # module Unicorn
> if 100 == response.first.to_i
> client.write(Const::EXPECT_100_RESPONSE)
> @@ -641,6 +646,9 @@ module Unicorn
> HttpResponse.write(client, response, HttpRequest::PARSER.headers?)
> rescue => e
> handle_error(client, e)
> + ensure
> + worker.request_start = Time.now.to_i
> + worker.request_uri = nil
> end
> + # used to see what a worker is doing when it''s sent an :INFO
signal
> + def worker_info(worker)
> + "worker[#{worker.nr}] - #{worker.request_uri ||
"idle"} - #{(Time.now.to_i - worker.request_start).to_s if
worker.request_start}"
No long lines, please, I can only work in 80 column terminals.
Also, the prevalent logger calls use "worker=#{worker.nr}" and not
"worker[#{worker.nr}]"
Since Unicorn::HttpRequest::REQ is global (ZOI rule), we can just read
that hash directly, no need to stash stuff in the worker object.
Based on the proposed middleware, we can have this.
trap(:INFO) do
t0 = HttpRequest::REQ[Info::TIME_KEY]
logger.info "worker=#{worker.nr} - " \
"#{HttpRequest::REQ[''REQUEST_URI''] ||
''idle''} - " \
"#{(Time.now.to_i - t0) if t0}"
end if defined?(Unicorn::Info)
Thanks for digging into the code, let me know what you think of the
proposed middleware solution.
--
Eric Wong