From: Eric Wong <e@80x24.org>
To: unicorn-public@bogomips.org
Cc: Simon Eskildsen <simon.eskildsen@shopify.com>
Subject: [PATCH 3/3] support "struct tcp_info" on non-Linux and Ruby 2.2+
Date: Wed, 8 Mar 2017 06:02:57 +0000 [thread overview]
Message-ID: <20170308060257.23740-4-e@80x24.org> (raw)
In-Reply-To: <20170308060257.23740-1-e@80x24.org>
Ruby 2.2+ can show "struct tcp_info" as a string via
Socket::Option#inspect, and we can attempt to parse it
out to extract the information we need.
Parsing this string is inefficient, but does not depend on the
ordering of the tcp_info struct.
---
lib/unicorn/http_request.rb | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index 68bde16..c08097c 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -29,6 +29,7 @@ class Unicorn::HttpParser
EMPTY_ARRAY = [].freeze
@@input_class = Unicorn::TeeInput
@@check_client_connection = false
+ @@tcpi_inspect_ok = true
def self.input_class
@@input_class
@@ -127,8 +128,37 @@ def closed_state?(state) # :nodoc:
end
end
else
+
+ # Ruby 2.2+ can show struct tcp_info as a string Socket::Option#inspect.
+ # Not that efficient, but probably still better than doing unnecessary
+ # work after a client gives up.
def check_client_connection(socket) # :nodoc:
- write_http_header(socket)
+ if Unicorn::TCPClient === socket && @@tcpi_inspect_ok
+ opt = socket.getsockopt(:IPPROTO_TCP, :TCP_INFO).inspect
+ if opt =~ /\bstate=(\S+)/
+ @@tcpi_inspect_ok = true
+ raise Errno::EPIPE, "client closed connection".freeze,
+ EMPTY_ARRAY if closed_state_str?($1)
+ else
+ @@tcpi_inspect_ok = false
+ write_http_header(socket)
+ end
+ opt.clear
+ else
+ write_http_header(socket)
+ end
+ end
+
+ def closed_state_str?(state)
+ case state
+ when 'ESTABLISHED'
+ false
+ # not a typo, ruby maps TCP_CLOSE (no 'D') to state=CLOSED (w/ 'D')
+ when 'CLOSE_WAIT', 'TIME_WAIT', 'CLOSED', 'LAST_ACK', 'CLOSING'
+ true
+ else
+ false
+ end
end
end
--
EW
next prev parent reply other threads:[~2017-03-08 6:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-08 6:02 [PATCH 0/3] TCP_INFO check_client_connection followups Eric Wong
2017-03-08 6:02 ` [PATCH 1/3] new test for check_client_connection Eric Wong
2017-03-08 6:02 ` [PATCH 2/3] revert signature change to HttpServer#process_client Eric Wong
2017-03-08 6:02 ` Eric Wong [this message]
2017-03-08 10:14 ` [PATCH 0/3] TCP_INFO check_client_connection followups Simon Eskildsen
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/unicorn/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170308060257.23740-4-e@80x24.org \
--to=e@80x24.org \
--cc=simon.eskildsen@shopify.com \
--cc=unicorn-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/unicorn.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).