falcon 0.55.2 → 0.55.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e901867477864a82832904cbaa1662105e6dce12190e057d457a666fa3dfe42
-  data.tar.gz: 523e181a6685bfe398bc5630076ab8e76642bf47181d4e20c62192813f121712
+  metadata.gz: 15fd796344aad14ba00e77762e66e298565fca37152a58d0958e2de017eb3df2
+  data.tar.gz: 3c93f36c92e58b888b3e22e04a934a53232c2c6e200d0dca0a9d0ea1b824ac04
 SHA512:
-  metadata.gz: 0eb64a874478507caeafefb4c83b108cfa7b00326cf69ce7581ab534e9466048dea1572b66044f06ee19b21998fafad32cf5de3ea050f6ae0f32b1743424ef2e
-  data.tar.gz: 3f041a4ebdf07b1063373a27e7151b4f8380f4f440b34a773f27b0b6761d64f721209c5a7d2366f1210e1be1d3042d1e8bed117a77a7ce81d9335274636fe656
+  metadata.gz: 2b21c996cf29059c8f187b5b32d6502c55198e4f8311c270469db21ddbf3e56b47f84a27dbb504f53405be224a7eec6d1d3f38514c0c6601613f5994f0cda7e7
+  data.tar.gz: cf27a313ae901795696b4a30d92b7e53b22e1497c6fa79b8044f1c363eabb47dc0b55d0ac39b5947d7056b1be7157e94affc26d182efe12bf1d1eaace9f95270

data/lib/falcon/body/request_finished.rb

@@ -14,7 +14,9 @@ module Falcon
 		# then decrements the metric. Use this so requests_active stays elevated until
 		# the request is fully finished (including response_finished callbacks).
 		class RequestFinished < Protocol::HTTP::Body::Wrapper
-			# Wrap a response body with a metric. If the body is nil or empty, decrements immediately.
+			# Wrap a response body with a metric.
+			#
+			# Expects the caller to have incremented `requests_active` beforehand. If the body is not wrapped (nil or empty message/body, or an error while assigning the wrapper), the `ensure` block decrements once. When wrapped, the metric is decremented in {#close}.
 			#
 			# @parameter message [Protocol::HTTP::Response] The response whose body to wrap.
 			# @parameter metric [Async::Utilization::Metric] The metric to decrement when the body is closed.
@@ -29,6 +31,8 @@ module Falcon
 				message
 			end
 			
+			# Initialize the wrapper.
+			#
 			# @parameter body [Protocol::HTTP::Body::Readable] The body to wrap.
 			# @parameter metric [Async::Utilization::Metric] The metric to decrement on close.
 			def initialize(body, metric)

data/lib/falcon/server.rb

@@ -69,10 +69,22 @@ module Falcon
 		# Body::RequestFinished wrapper runs the decrement after the body closes,
 		# so response_finished callbacks are counted as active.
 		def call(...)
+			decrement = false
+			
 			@requests_total_metric.increment
 			@requests_active_metric.increment
+			decrement = true
+			
+			# Roll back `requests_active` unless the full `super` + wrap path completes. Covers
+			# `super` raising before `wrap` runs, errors inside `wrap`, and other abnormal exits.
+			response = Body::RequestFinished.wrap(super, @requests_active_metric)
+			decrement = false
 			
-			return Body::RequestFinished.wrap(super, @requests_active_metric)
+			return response
+		ensure
+			if decrement
+				@requests_active_metric.decrement
+			end
 		end
 		
 		# Generates a human-readable string representing the current statistics.

data/lib/falcon/version.rb

@@ -5,5 +5,5 @@
 
 # @namespace
 module Falcon
-	VERSION = "0.55.2"
+	VERSION = "0.55.3"
 end

data/readme.md

@@ -47,9 +47,13 @@ Please see the [project documentation](https://socketry.github.io/falcon/) for m
 
 Please see the [project releases](https://socketry.github.io/falcon/releases/index) for all releases.
 
+### v0.55.3
+
+  - Decrement `requests_active` in `Falcon::Server#call` when `super` or `Falcon::Body::RequestFinished.wrap` raises, so utilization metrics are not leaked on error paths.
+
 ### v0.55.2
 
-  - Remove unnecessary require for `async/service/supervisor/supervised`."
+  - Remove unnecessary require for `async/service/supervisor/supervised`.
 
 ### v0.55.1
 
@@ -91,11 +95,6 @@ Please see the [project releases](https://socketry.github.io/falcon/releases/ind
 
   - Add <code class="language-ruby">Falcon::Environment::Server\#endpoint\_options</code> to allow configuration of the endpoint options more easily.
 
-### v0.49.0
-
-  - [Falcon Server Container Health Checks](https://socketry.github.io/falcon/releases/index#falcon-server-container-health-checks)
-  - [Falcon Server Process Title](https://socketry.github.io/falcon/releases/index#falcon-server-process-title)
-
 ## Contributing
 
 We welcome contributions to this project.

data/releases.md

@@ -1,8 +1,12 @@
 # Releases
 
+## v0.55.3
+
+  - Decrement `requests_active` in `Falcon::Server#call` when `super` or `Falcon::Body::RequestFinished.wrap` raises, so utilization metrics are not leaked on error paths.
+
 ## v0.55.2
 
-  - Remove unnecessary require for `async/service/supervisor/supervised`."
+  - Remove unnecessary require for `async/service/supervisor/supervised`.
 
 ## v0.55.1
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.55.2
+  version: 0.55.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.
 test_files: []