puma-status 0.1.4 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ca2fb63b6be20e85ac281783c213be6227b29a268d98c743ebf5f15c8ce57af
-  data.tar.gz: 6ba41b60919c9271d47e1e1e94e4d3a951b49f413e51a7a85f9a8fc26bce1d5b
+  metadata.gz: 12ca14da024cebc278c903552c9bfe21afccfabec8baea2972ac4b3e7b241ab1
+  data.tar.gz: f738a71b63d55124ee43e921f69f9d81295360c9d43925716ed0bb3716751907
 SHA512:
-  metadata.gz: 8233f7045c47ff7172990686b5be21178d0b2df078001ddad38572aeafd8127e2a5d0dc70604f75676a58e59fdcd2139674b2f7aa970e169e2f471b833c9af69
-  data.tar.gz: 0ce03ee787e21a2b5f49a69d4d28089429a0f95fd993dadbb897e90883315c4bc93f2790e3490640362d0cd14c8f982618a8176e7b2111ebb1aca8630655dfe3
+  metadata.gz: 4b96bb8f8ebd7776dd6a3b023c533e53638bf63da61efe5e5c9abb9111ff0ad05aa615584ffa3a804e00ddc1d7cc8cabbec46be677044139e97b722a60eb7f62
+  data.tar.gz: e136edb4aed4f52dc06ecda5e48b43b4c92e13b79619277c0d63cc4ac960009855ec4a8d475fe8c23721e0164799b6692f4863b506ac2eb7cf5039551d723af6

data/lib/core.rb

@@ -1,13 +1,28 @@
 require 'yaml'
 require 'json'
 require 'net_x/http_unix'
+require 'openssl'
 require 'time'
 require_relative 'stats'
 
 def get_stats(state_file_path)
   puma_state = YAML.load_file(state_file_path)
 
-  client = NetX::HTTPUnix.new(puma_state["control_url"])
+  uri = URI.parse(puma_state["control_url"])
+
+  address = if uri.scheme =~ /unix/i
+              [uri.scheme, '://', uri.host, uri.path].join
+            else
+              [uri.host, uri.path].join
+            end
+
+  client = NetX::HTTPUnix.new(address, uri.port)
+
+  if uri.scheme =~ /ssl/i
+    client.use_ssl = true 
+    client.verify_mode = OpenSSL::SSL::VERIFY_NONE if ENV['SSL_NO_VERIFY'] == '1'
+  end
+
   req = Net::HTTP::Get.new("/stats?token=#{puma_state["control_auth_token"]}")
   resp = client.request(req)
   raw_stats = JSON.parse(resp.body)
@@ -36,25 +51,41 @@ def hydrate_stats(stats, puma_state, state_file_path)
 
   stats.tap do |s|
     stats.workers.map do |wstats|
-      wstats.mem = top_stats[wstats.pid][:mem]
-      wstats.pcpu = top_stats[wstats.pid][:pcpu]
+      wstats.mem = top_stats.dig(wstats.pid, :mem) || 0
+      wstats.pcpu = top_stats.dig(wstats.pid, :pcpu) || 0
+      wstats.killed = !top_stats.key?(wstats.pid) || (wstats.mem <=0 && wstats.pcpu <= 0)
     end
   end
 end
 
-def display_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 += "| Load: #{color(75, 50, stats.load, asciiThreadLoad(stats.running_threads, stats.max_threads))}"
+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
 
-  puts master_line
+  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 += " | Req: #{stats.requests_count}" if stats.requests_count
+  end
+
+  output = [master_line] + stats.workers.map 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)}"
 
-  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.max_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
+    if wstats.booting?
+      worker_line += " #{warn("booting")}"
+    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 += " | 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
 
-    puts worker_line
+    worker_line
   end
+
+  output.join("\n")
 end

data/lib/helpers.rb

@@ -4,17 +4,29 @@ def debug(str)
   puts str if ENV.key?('DEBUG')
 end
 
-def color(critical, warn, value, str)
+def warn(str)
+  colorize(str, :yellow)
+end
+
+def error(str)
+  colorize(str, :red)
+end
+
+def colorize(str, color_name)
   return str if ENV.key?('NO_COLOR')
+  str.to_s.colorize(color_name)
+end
 
-  color = if value >= critical
+def color(critical, warn, value, str = nil)
+  str = value unless str
+  color_level = if value >= critical
             :red
           elsif value < critical && value >= warn
             :yellow
           else
             :green
           end
-  str.to_s.colorize(color)
+  colorize(str, color_level)
 end
 
 def asciiThreadLoad(idx, total)

data/lib/puma-status.rb

@@ -1,16 +1,48 @@
 require_relative './helpers'
 require_relative './core.rb'
+require 'parallel'
 
 def run
   debug "puma-status"
 
-  if ARGV.count != 1
+  if ARGV.count < 1
     puts "Call with:"
     puts "\tpuma-status path/to/puma.state"
     exit -1
   end
 
-  state_file_path = ARGV[0]
-  debug "State file: #{state_file_path}"
-  display_stats(get_stats(state_file_path))
+  errors = []
+  
+  outputs = Parallel.map(ARGV, in_threads: ARGV.count) do |state_file_path|
+    begin
+      debug "State file: #{state_file_path}"
+      format_stats(get_stats(state_file_path))
+    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 => 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}"
+      nil
+    end
+  end
+
+  outputs.compact.each { |output| puts output }
+
+  if errors.any?
+    puts ""
+    errors.each { |error| puts error }
+  end
 end

data/lib/stats.rb

@@ -9,6 +9,14 @@ class Stats
       @wstats['pid']
     end
 
+    def killed=(killed)
+      @wstats['killed'] = killed
+    end
+
+    def killed?
+      !!@wstats['killed']
+    end
+
     def mem=(mem)
       @wstats['mem'] = mem
     end
@@ -25,6 +33,10 @@ class Stats
       @wstats['pcpu']
     end
 
+    def booting?
+      @wstats.key?('last_status') && @wstats['last_status'].empty?
+    end
+
     def running
       @wstats.dig('last_status', 'running') || @wstats['running'] || 0
     end
@@ -55,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
@@ -71,7 +87,7 @@ class Stats
   end
 
   def workers
-    (@stats['worker_status'] || [@stats]).map { |wstats| Worker.new(wstats) }
+    @workers ||= (@stats['worker_status'] || [@stats]).map { |wstats| Worker.new(wstats) }
   end
 
   def pid=(pid)
@@ -95,6 +111,10 @@ class Stats
     (Time.now - Time.parse(@stats['started_at'])).to_i
   end
 
+  def booting?
+    workers.all?(&:booting?)
+  end
+
   def total_threads
     workers.reduce(0) { |total, wstats| total + wstats.max_threads }
   end
@@ -107,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.1.4
+  version: '1.1'
 platform: ruby
 authors:
 - Yoann Lecuyer
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -105,14 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.0
 signing_key: 
 specification_version: 4
 summary: Command-line tool for puma to display information about running request/process