puma-status 1.0 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f95a656741b1b1aafddb43954a144399db944b78ca6384e9ec77cc0783ca750
-  data.tar.gz: a1b2f9addd173d84404bb94e26ec38522586d72fca0e190562d86d9a3e95b92a
+  metadata.gz: 22bea1d3a501185590a81878994456d75a4c5375794221bdeb51b3283d65cceb
+  data.tar.gz: a2670a54fdd6c4dae1040c59882f969ba1aff3487076d75962e2fa105da32b59
 SHA512:
-  metadata.gz: a44a39a95544ba5a9cd42b4e87ac2409a5b0c3623dad6af622c7a589be755c91ab26af03daf7a7304d2ba0da8e9a216a6a850dd5409e7f75d8eee2e5a6c79a23
-  data.tar.gz: a344489b4164ff044ff37ac39b4cfaab7a9f4ea74fe2c1cc12a6c124d3804a94260423c2be8ca12d02b42f30754a30f630de8bf93cd723a12385a6b7dad211a6
+  metadata.gz: '09d1cfd981ee0c5092e9bda66009e2a4b517f3bfe3987559cfb571a9a4aa0c880e6ca45061cbd0a0c8bbc5016d2a11ba3410facc67b9924ab7643512110b2711'
+  data.tar.gz: 023b10377d8567d59c3b75028c4cd54c2f3db12d686bcf41d5a6fcd69aabf45c6e5a89b3c956afa8e98d7ec696c5ef85801fd6a8625adf6b9d42a1aea9a584fc

data/lib/core.rb

@@ -3,13 +3,14 @@ require 'json'
 require 'net_x/http_unix'
 require 'openssl'
 require 'time'
+require 'open3'
 require_relative 'stats'
 
 def get_stats(state_file_path)
   puma_state = YAML.load_file(state_file_path)
 
   uri = URI.parse(puma_state["control_url"])
-  
+
   address = if uri.scheme =~ /unix/i
               [uri.scheme, '://', uri.host, uri.path].join
             else
@@ -19,7 +20,7 @@ def get_stats(state_file_path)
   client = NetX::HTTPUnix.new(address, uri.port)
 
   if uri.scheme =~ /ssl/i
-    client.use_ssl = true 
+    client.use_ssl = true
     client.verify_mode = OpenSSL::SSL::VERIFY_NONE if ENV['SSL_NO_VERIFY'] == '1'
   end
 
@@ -32,10 +33,26 @@ def get_stats(state_file_path)
   hydrate_stats(stats, puma_state, state_file_path)
 end
 
+def get_memory_from_top(raw_memory)
+  case raw_memory[-1].downcase
+  when 'g'
+    (raw_memory[0...-1].to_f*1024).to_i
+  when 'm'
+    raw_memory[0...-1].to_i
+  else
+    raw_memory.to_i/1024
+  end
+end
+
+PID_COLUMN = 0
+MEM_COLUMN = 5
+CPU_COLUMN = 8
+OPEN3_STDOUT = 1
+
 def get_top_stats(pids)
   pids.each_slice(19).inject({}) do |res, pids19|
-    top_result = `top -b -n 1 -p #{pids19.join(',')} | tail -n #{pids19.length}`
-    top_result.split("\n").map { |row| r = row.split(' '); [r[0].to_i, r[5].to_i/1024, r[8].to_f] }
+    top_result = Open3.popen3({ 'LC_ALL' => 'C' }, "top -b -n 1 -p #{pids19.map(&:to_i).join(',')}")[OPEN3_STDOUT].read
+    top_result.split("\n").last(pids19.length).map { |row| r = row.split(' '); [r[PID_COLUMN].to_i, get_memory_from_top(r[MEM_COLUMN]), r[CPU_COLUMN].to_f] }
       .inject(res) { |hash, row| hash[row[0]] = { mem: row[1], pcpu: row[2] }; hash }
     res
   end
@@ -65,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
 
@@ -77,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)
@@ -44,8 +49,10 @@ def seconds_to_human(seconds)
   #=> 23h59m
   #=>  1d 0h
   #=>    24d
-  
-  if seconds < 60*60
+
+  if seconds <= 0
+    "--m--s"
+  elsif seconds < 60*60
     "#{(seconds/60).to_s.rjust(2, ' ')}m#{(seconds%60).to_s.rjust(2, ' ')}s"
   elsif seconds >= 60*60*1 && seconds < 60*60*24
     "#{(seconds/(60*60*1)).to_s.rjust(2, ' ')}h#{((seconds%(60*60*1))/60).to_s.rjust(2, ' ')}m"

data/lib/puma-status.rb

@@ -17,11 +17,21 @@ def run
     begin
       debug "State file: #{state_file_path}"
       format_stats(get_stats(state_file_path))
-    rescue Errno::ENOENT
-      errors << "#{warn(state_file_path)} doesn't exists"
+    rescue Errno::ENOENT => e
+      if e.message =~ /#{state_file_path}/
+        errors << "#{warn(state_file_path)} doesn't exists"
+      elsif e.message =~ /connect\(2\) for [^\/]/
+        errors << "#{warn("Relative Unix socket")}: the Unix socket of the control app has a relative path. Please, ensure you are running from the same folder has puma."
+      else
+        errors << "#{error(state_file_path)} an unhandled error occured: #{e.inspect}"
+      end
       nil
-    rescue Errno::EISDIR
-      errors << "#{warn(state_file_path)} isn't a state file"
+    rescue Errno::EISDIR => e
+      if e.message =~ /#{state_file_path}/
+        errors << "#{warn(state_file_path)} isn't a state file"
+      else
+        errors << "#{error(state_file_path)} an unhandled error occured: #{e.inspect}"
+      end
       nil
     rescue => e
       errors << "#{error(state_file_path)} an unhandled error occured: #{e.inspect}"

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.0'
+  version: '1.4'
 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
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.0
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Command-line tool for puma to display information about running request/process
 test_files: []