puma-status 0.2.1 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 379b1ab081684ba19977385c0bad2d6b1635d9fd56225a35b89698574281c832
-  data.tar.gz: 1e8db9d9acbe9a74e850c5ff214bd8258a5c6d748e1e662367003297c40d185a
+  metadata.gz: 2f95a656741b1b1aafddb43954a144399db944b78ca6384e9ec77cc0783ca750
+  data.tar.gz: a1b2f9addd173d84404bb94e26ec38522586d72fca0e190562d86d9a3e95b92a
 SHA512:
-  metadata.gz: 8f2f695e9b510c2dd0f3eb6f808e927dae5a596a69d1e7d8347617c6590e09d0c299c2f66f63574fe95da971fe85c780cea407da2ade8a5eb443230ebbdc22ff
-  data.tar.gz: d618f0c0bc28f4fdf6720b3e595269670967185bacbb5c754fde0e6bf863d37dbe5bb12692099bb25f15a46a634894b494a5bb5dba6c649a5771653862d8567d
+  metadata.gz: a44a39a95544ba5a9cd42b4e87ac2409a5b0c3623dad6af622c7a589be755c91ab26af03daf7a7304d2ba0da8e9a216a6a850dd5409e7f75d8eee2e5a6c79a23
+  data.tar.gz: a344489b4164ff044ff37ac39b4cfaab7a9f4ea74fe2c1cc12a6c124d3804a94260423c2be8ca12d02b42f30754a30f630de8bf93cd723a12385a6b7dad211a6

data/lib/core.rb

@@ -59,13 +59,14 @@ def hydrate_stats(stats, puma_state, state_file_path)
 end
 
 def format_stats(stats)
-  master_line = "#{stats.pid} (#{stats.state_file_path}) Uptime: #{seconds_to_human(stats.uptime)} "
-  master_line += "| Phase: #{stats.phase} " if stats.phase
+  master_line = "#{stats.pid} (#{stats.state_file_path}) Uptime: #{seconds_to_human(stats.uptime)}"
+  master_line += " | Phase: #{stats.phase}" if stats.phase
 
   if stats.booting?
-    master_line += warn("booting")
+    master_line += " #{warn("booting")}"
   else
-    master_line += "| Load: #{color(75, 50, stats.load, asciiThreadLoad(stats.running_threads, stats.max_threads))}"
+    master_line += " | Load: #{color(75, 50, stats.load, asciiThreadLoad(stats.running_threads, stats.max_threads))}"
+    master_line += " | Req: #{stats.requests_count}" if stats.requests_count
   end
 
   output = [master_line] + stats.workers.map do |wstats|
@@ -77,7 +78,8 @@ def format_stats(stats)
       worker_line += " #{error("killed")}"
     else
       worker_line += " | Load: #{color(75, 50, wstats.load, asciiThreadLoad(wstats.running_threads, wstats.max_threads))}"
-      worker_line += " Phase: #{error(wstats.phase)}" if wstats.phase != stats.phase
+      worker_line += " | Phase: #{error(wstats.phase)}" if wstats.phase != stats.phase
+      worker_line += " | Req: #{wstats.requests_count}" if wstats.requests_count
       worker_line += " Queue: #{error(wstats.backlog.to_s)}" if wstats.backlog > 0
       worker_line += " Last checkin: #{error(wstats.last_checkin)}" if wstats.last_checkin >= 10
     end

data/lib/stats.rb

@@ -67,6 +67,10 @@ class Stats
       (Time.now - Time.parse(@wstats['started_at'])).to_i
     end
 
+    def requests_count
+      @wstats.dig('last_status', 'requests_count') || @wstats['requests_count']
+    end
+
     def backlog
       @wstats.dig('last_status', 'backlog') || 0
     end
@@ -123,6 +127,12 @@ class Stats
     workers.reduce(0) { |total, wstats| total + wstats.max_threads }
   end
 
+  def requests_count
+    workers_with_requests_count = workers.select(&:requests_count)
+    return if workers_with_requests_count.none?
+    workers_with_requests_count.reduce(0) { |total, wstats| total + wstats.requests_count }
+  end
+
   def running
     @stats['running'] || 0
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma-status
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '1.0'
 platform: ruby
 authors:
 - Yoann Lecuyer
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.0
 signing_key: 
 specification_version: 4
 summary: Command-line tool for puma to display information about running request/process