Add ThreadPool#stats and adjust Server#stats to use it (#3527)

puma · Oct 26, 2024 · 2482fac · 2482fac
1 parent b7e4c8c
commit 2482fac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/puma/server.rb b/lib/puma/server.rb
@@ -651,8 +651,12 @@ def shutting_down?
     # Returns a hash of stats about the running server for reporting purposes.
     # @version 5.0.0
     # @!attribute [r] stats
+    # @return [Hash] hash containing stat info from `Server` and `ThreadPool`
     def stats
-      STAT_METHODS.map {|name| [name, send(name) || 0]}.to_h
+      stats = @thread_pool&.stats || {}
+      stats[:max_threads]    = @max_threads
+      stats[:requests_count] = @requests_count
+      stats
     end
 
     # below are 'delegations' to binder

diff --git a/lib/puma/thread_pool.rb b/lib/puma/thread_pool.rb
@@ -85,6 +85,17 @@ def self.clean_thread_locals
       end
     end
 
+    # generate stats hash so as not to perform multiple locks
+    # @return [Hash] hash containing stat info from ThreadPool
+    def stats
+      with_mutex do
+        { backlog: @todo.size,
+          running: @spawned,
+          pool_capacity: @waiting + (@max - @spawned)
+        }
+      end
+    end
+
     # How many objects have yet to be processed by the pool?
     #
     def backlog