Merge pull request #115 from Earlopain/increment-before-callback

Fix off-by-one for `requests_count` during `after_request_complete`
Shopify · May 9, 2024 · 508f12a · 508f12a
2 parents 37a0f9d + 37c55e1
commit 508f12a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/pitchfork/http_server.rb b/lib/pitchfork/http_server.rb
@@ -849,8 +849,8 @@ def worker_loop(worker)
                 worker.update(client)
               else
                 request_env = process_client(client, worker, prepare_timeout(worker))
-                @after_request_complete&.call(self, worker, request_env)
                 worker.increment_requests_count
+                @after_request_complete&.call(self, worker, request_env)
               end
               worker.update_deadline(@timeout)
             end

diff --git a/test/integration/test_configuration.rb b/test/integration/test_configuration.rb
@@ -9,10 +9,8 @@ def test_after_request_complete
       listen "#{addr}:#{port}"
       worker_processes 1
 
-      request_count = 0
       after_request_complete do |server, worker, env|
-        request_count += 1
-        $stderr.puts "[after_request_complete] request_count=\#{request_count} path=\#{env['PATH_INFO']}"
+        $stderr.puts "[after_request_complete] worker_requests_count=\#{worker.requests_count} path=\#{env['PATH_INFO']}"
       end
 
       before_worker_exit do |server, worker|
@@ -21,7 +19,7 @@ def test_after_request_complete
     CONFIG
 
     assert_healthy("http://#{addr}:#{port}")
-    assert_stderr("[after_request_complete] request_count=1 path=/")
+    assert_stderr("[after_request_complete] worker_requests_count=1 path=/")
     assert_healthy("http://#{addr}:#{port}")
 
     assert_clean_shutdown(pid)