puma-status 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a3510db7ca511e5f6a661691bc2126aa17de54ceedbaa9dc308c2d7e215c6bd
-  data.tar.gz: 1a3e97ac2ac36cf2fdfb1113aa961523e9912be90842dd9e534689e489718536
+  metadata.gz: f327ff6c023bad34b7c01a219db11210cebad0bf54406a128968217603021fec
+  data.tar.gz: e5cf7266ef9680ca884ff82614a9855738a368acb1702b2dc79a1ed3bcadb8bd
 SHA512:
-  metadata.gz: 2a63842da6fb0657826c7caba586a018f56983865999e4c9576af6f2d02a965367091450086f27a6e52bfdb07e2409dbd7723be3b384e7899cf3cc714607f63f
-  data.tar.gz: 027417e5cd61121b0b1293caeeee0332d2f269fbc33a386566832963e1e53be1939a42c7815bdf56711210cef466b30bd0bd45c1b3713bc6d3a43107afc0ff4d
+  metadata.gz: 1e483270e101d60a19402fbab29ee6165fbc1db1c5a7920a857e2a90611f7f09f0dddf366a3aedbc83d9d933af085ae823502491f8444d44501d8d8a63beed0c
+  data.tar.gz: 173715cae769db0f9d58ca25c4eb7c64a3fc96d203824eef9f2620d16a2483105273f9e7a3176bc9684d37b73a8a46993708833b870ed2e08f02c7279e1ef1a0

data/lib/core.rb

@@ -43,12 +43,17 @@ def hydrate_stats(stats, puma_state, state_file_path)
 end
 
 def display_stats(stats)
-  puts "#{stats.pid} (#{stats.state_file_path}) Uptime: #{seconds_to_human(stats.uptime)} | Load: #{color(75, 50, stats.load, asciiThreadLoad(stats.running_threads, stats.total_threads))}"
+  master_line = "#{stats.pid} (#{stats.state_file_path}) Uptime: #{seconds_to_human(stats.uptime)} "
+  master_line += "| Phase: #{stats.phase} " if stats.phase
+  master_line += "| Load: #{color(75, 50, stats.load, asciiThreadLoad(stats.running_threads, stats.total_threads))}"
+
+  puts master_line
 
   stats.workers.each do |wstats|
     worker_line = " └ #{wstats.pid.to_s.rjust(5, ' ')} CPU: #{color(75, 50, wstats.pcpu, wstats.pcpu.to_s.rjust(5, ' '))}% Mem: #{color(1000, 750, wstats.mem, wstats.mem.to_s.rjust(4, ' '))} MB Uptime: #{seconds_to_human(wstats.uptime)} | Load: #{color(75, 50, wstats.load, asciiThreadLoad(wstats.running_threads, wstats.total_threads))}"
     worker_line += " #{("Queue: " + wstats.backlog.to_s).colorize(:red)}" if wstats.backlog > 0
     worker_line += " Last checkin: #{wstats.last_checkin}" if wstats.last_checkin >= 10
+    worker_line += " Phase: #{wstats.phase}" if wstats.phase != stats.phase
 
     puts worker_line
   end

data/lib/stats.rb

@@ -30,12 +30,20 @@ class Stats
     end
     alias :total_threads :running
 
+    def max_threads
+      @wstats.dig('last_status', 'max_threads') || @wstats['max_threads'] || 0
+    end
+
     def pool_capacity
       @wstats.dig('last_status', 'pool_capacity') || @wstats['pool_capacity'] || 0
     end
 
     def running_threads
-      running - pool_capacity
+      max_threads - pool_capacity
+    end
+
+    def phase
+      @wstats['phase']
     end
 
     def load
@@ -88,11 +96,11 @@ class Stats
   end
 
   def total_threads
-    workers.reduce(0) { |total, wstats| total + wstats.running }
+    workers.reduce(0) { |total, wstats| total + wstats.max_threads }
   end
 
   def running_threads
-    workers.reduce(0) { |total, wstats| total + (wstats.running - wstats.pool_capacity) }
+    workers.reduce(0) { |total, wstats| total + wstats.running_threads }
   end
 
   def running
@@ -103,6 +111,10 @@ class Stats
     @stats['pool_capacity'] || 0
   end
 
+  def phase
+    @stats['phase']
+  end
+
   def load
     running_threads/total_threads.to_f*100
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma-status
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Yoann Lecuyer
@@ -112,9 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Command-line too for puma to display information about running request/process
+summary: Command-line tool for puma to display information about running request/process
 test_files: []