Handle errors in rack.after_reply

Ref: #97 Don't break the callback chain if one callback raised.
Shopify · Mar 11, 2024 · a410482 · a410482
1 parent b101411
commit a410482
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+- Don't break the `rack.after_reply` callback chain if one callback raises (#97).
+
 # 0.11.1
 
 - Fix Ruby 3.4-dev compatibility.

diff --git a/lib/pitchfork/http_server.rb b/lib/pitchfork/http_server.rb
@@ -762,7 +762,13 @@ def process_client(client, worker, timeout_handler)
       handle_error(client, e)
       env
     ensure
-      env["rack.after_reply"].each(&:call) if env
+      if env
+        env["rack.after_reply"].each do |callback|
+          callback.call
+        rescue => error
+          Pitchfork.log_error(@logger, "rack.after_reply error", error)
+        end
+      end
       timeout_handler.finished
       env
     end

diff --git a/test/slow/test_server.rb b/test/slow/test_server.rb
@@ -41,6 +41,7 @@ def call(env)
       while env['rack.input'].read(4096)
       end
 
+      env["rack.after_reply"] << -> { raise "oops" }
       env["rack.after_reply"] << -> { @called = true }
 
       [200, { 'content-type' => 'text/plain' }, ["after_reply_called: #{@called}"]]