puma-status 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec73cc842d7b353e3f3994d554c4fdc6b1b7eab51452c578581d855610af613d
-  data.tar.gz: 6d44df05c3a303e3440406146921f4955a85fbded8ae131b29f1fec83f56b8fa
+  metadata.gz: ded7bd0b4bca01b8b07ca16c7380453cf96f49d0c00667d024a6317d7307cea0
+  data.tar.gz: a391f836ca1c5d1a40acbab75178fd4c569d25005fac3c83bfd981051e1a7d66
 SHA512:
-  metadata.gz: ab70d17e5b5c35bacce07819392f2818f62020287d7070618af64fa58e1da9f71fe7de126f60d2886a29c2d13d6e31698f071784f6f98c9c5773a7ee934e16b6
-  data.tar.gz: 41a1df505a6bb1299973a8972522b700d16b9d40232f567e237b20ce637de89733a72e7eae4944dcd0950c0c7b13a755353fbca601da55dc4d56167b5b2f8a66
+  metadata.gz: c3968446849e0078c9cb557c721a1f5a2226a5ca1533016b319d15ec4c2e769a88062c8f354de28451fad533ba6502707a79660bf9a0469c677482f270ab1c65
+  data.tar.gz: e186aefc643f0ce7bfaf9515d5a36fc71558c0a871d792914e55e5867d5d0d9e4e32d04a71f27429ab1ae19f43054d06ae00c47911f209bcf423c197e4c586b6

data/lib/core.rb

@@ -82,7 +82,7 @@ def format_stats(stats)
   if stats.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.spawned_threads, stats.max_threads))}"
     master_line += " | Req: #{stats.requests_count}" if stats.requests_count
   end
 
@@ -94,7 +94,7 @@ def format_stats(stats)
     elsif wstats.killed?
       worker_line += " #{error("killed")}"
     else
-      worker_line += " | Load: #{color(75, 50, wstats.load, asciiThreadLoad(wstats.running_threads, wstats.max_threads))}"
+      worker_line += " | Load: #{color(75, 50, wstats.load, asciiThreadLoad(wstats.running_threads, wstats.spawned_threads, wstats.max_threads))}"
       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

data/lib/helpers.rb

@@ -29,11 +29,16 @@ def color(critical, warn, value, str = nil)
   colorize(str, color_level)
 end
 
-def asciiThreadLoad(idx, total)
+def asciiThreadLoad(running, spawned, total)
   full = "█"
-  empty= "░"
+  half= "░"
+  empty = " "
 
-  "#{idx}[#{full*idx}#{empty*(total-idx)}]#{total}"
+  full_count = running
+  half_count = [spawned - running, 0].max
+  empty_count = total - half_count - full_count
+
+  "#{running}[#{full*full_count}#{half*half_count}#{empty*empty_count}]#{total}"
 end
 
 def seconds_to_human(seconds)

data/lib/stats.rb

@@ -41,10 +41,12 @@ class Stats
       @wstats.dig('last_status', 'running') || @wstats['running'] || 0
     end
     alias :total_threads :running
+    alias :spawned_threads :running
 
     def max_threads
       @wstats.dig('last_status', 'max_threads') || @wstats['max_threads'] || 0
     end
+    alias :total_threads :max_threads
 
     def pool_capacity
       @wstats.dig('last_status', 'pool_capacity') || @wstats['pool_capacity'] || 0
@@ -123,6 +125,10 @@ class Stats
     workers.reduce(0) { |total, wstats| total + wstats.running_threads }
   end
 
+  def spawned_threads
+    workers.reduce(0) { |total, wstats| total + wstats.spawned_threads }
+  end
+
   def max_threads
     workers.reduce(0) { |total, wstats| total + wstats.max_threads }
   end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: puma-status
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Yoann Lecuyer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2019-07-14 00:00:00.000000000 Z
@@ -94,8 +94,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description:
-email:
+description: 
+email: 
 executables:
 - puma-status
 extensions: []
@@ -111,7 +111,7 @@ homepage: https://github.com/ylecuyer/puma-status
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -126,8 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.3.0.dev
+signing_key: 
 specification_version: 4
 summary: Command-line tool for puma to display information about running request/process
 test_files: []