From: Blake Williams <blake@blakewilliams.me>
To: unicorn-public@yhbt.net
Subject: [PATCH] Add rack.after_reply functionality
Date: Tue, 8 Dec 2020 16:47:16 -0500 [thread overview]
Message-ID: <9873E53C-04D3-4759-9678-CA17DBAEF7B7@blakewilliams.me> (raw)
This adds `rack.after_reply` functionality which allows rack middleware
to pass lambdas that will be executed after the client connection has
been closed.
This was driven by a need to perform actions in a request that shouldn't
block the request from completing but also don't make sense as
background jobs.
There is prior art of this being supported found in a few gems, as well
as this functionality existing in other rack based servers.
---
lib/unicorn/http_server.rb | 4 ++++
test/unit/test_server.rb | 44 ++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb
index 05dad99..9889f55 100644
--- a/lib/unicorn/http_server.rb
+++ b/lib/unicorn/http_server.rb
@@ -629,6 +629,8 @@ def process_client(client)
end
end
+ env["rack.after_reply"] = []
+
status, headers, body = @app.call(env)
begin
@@ -651,6 +653,8 @@ def process_client(client)
end
rescue => e
handle_error(client, e)
+ ensure
+ env["rack.after_reply"].each { |after_reply| after_reply.call }
end
def nuke_listeners!(readers)
diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb
index 384fa6b..781750d 100644
--- a/test/unit/test_server.rb
+++ b/test/unit/test_server.rb
@@ -34,6 +34,24 @@ def call(env)
end
end
+class TestRackAfterReply
+ def initialize
+ @called = false
+ end
+
+ def call(env)
+ while env['rack.input'].read(4096)
+ end
+
+ env["rack.after_reply"] << -> { @called = true }
+
+ [200, { 'Content-Type' => 'text/plain' }, ["after_reply_called: #{@called}"]]
+ rescue Unicorn::ClientShutdown, Unicorn::HttpParserError => e
+ $stderr.syswrite("#{e.class}: #{e.message} #{e.backtrace.empty?}\n")
+ raise e
+ end
+end
+
class WebServerTest < Test::Unit::TestCase
def setup
@@ -114,6 +132,32 @@ def test_early_hints
assert_match %r{^HTTP/1.[01] 200\b}, responses
end
+ def test_after_reply
+ teardown
+
+ redirect_test_io do
+ @server = HttpServer.new(TestRackAfterReply.new,
+ :listeners => [ "127.0.0.1:#@port"])
+ @server.start
+ end
+
+ sock = TCPSocket.new('127.0.0.1', @port)
+ sock.syswrite("GET / HTTP/1.0\r\n\r\n")
+
+ responses = sock.read(4096)
+ assert_match %r{\AHTTP/1.[01] 200\b}, responses
+ assert_match %r{^after_reply_called: false}, responses
+
+ sock = TCPSocket.new('127.0.0.1', @port)
+ sock.syswrite("GET / HTTP/1.0\r\n\r\n")
+
+ responses = sock.read(4096)
+ assert_match %r{\AHTTP/1.[01] 200\b}, responses
+ assert_match %r{^after_reply_called: true}, responses
+
+ sock.close
+ end
+
def test_broken_app
teardown
app = lambda { |env| raise RuntimeError, "hello" }
--
2.29.2
next reply other threads:[~2020-12-08 21:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 21:47 Blake Williams [this message]
2020-12-08 22:46 ` [PATCH] Add rack.after_reply functionality Eric Wong
2020-12-08 23:48 ` Blake Williams
2020-12-09 9:43 ` Eric Wong
2020-12-09 14:58 ` Blake Williams
2020-12-09 22:18 ` Eric Wong
2020-12-09 23:44 ` Blake Williams
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=9873E53C-04D3-4759-9678-CA17DBAEF7B7@blakewilliams.me \
--to=blake@blakewilliams.me \
--cc=unicorn-public@yhbt.net \
/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).