puma-status 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46a19b27c114c23f83f652c395c9157d2581a0c688a42c2784c3660bef0f3277
-  data.tar.gz: 94a7a2cbee9aa0a082ddc38b61a32a4d2db3c3f8ad44a70b546a67b4a884dde8
+  metadata.gz: 379b1ab081684ba19977385c0bad2d6b1635d9fd56225a35b89698574281c832
+  data.tar.gz: 1e8db9d9acbe9a74e850c5ff214bd8258a5c6d748e1e662367003297c40d185a
 SHA512:
-  metadata.gz: f3b70ede2ef3c33c2436efe7da75faa5e858c5042572d07d26204487ea61a60d31cd2f9497502a5f8ae00bf00ecbdae0ac5ea6bceba1bfeec28036e9e18dc39c
-  data.tar.gz: f930e67b9deff2945d5f3a02c5635caf808b17a927527e533a3b7894e7b91ac59670c114c6fbb066a3be325fc9a78dc62cbfad12d26020a8e588b2a152d5e436
+  metadata.gz: 8f2f695e9b510c2dd0f3eb6f808e927dae5a596a69d1e7d8347617c6590e09d0c299c2f66f63574fe95da971fe85c780cea407da2ade8a5eb443230ebbdc22ff
+  data.tar.gz: d618f0c0bc28f4fdf6720b3e595269670967185bacbb5c754fde0e6bf863d37dbe5bb12692099bb25f15a46a634894b494a5bb5dba6c649a5771653862d8567d

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,8 +51,9 @@ 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
@@ -45,13 +61,27 @@ 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 += "| Load: #{color(75, 50, stats.load, asciiThreadLoad(stats.running_threads, stats.max_threads))}"
+
+  if stats.booting?
+    master_line += warn("booting")
+  else
+    master_line += "| Load: #{color(75, 50, stats.load, asciiThreadLoad(stats.running_threads, stats.max_threads))}"
+  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)} | 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
+    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)}"
+
+    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 += " Queue: #{error(wstats.backlog.to_s)}" if wstats.backlog > 0
+      worker_line += " Last checkin: #{error(wstats.last_checkin)}" if wstats.last_checkin >= 10
+    end
+
     worker_line
   end
 

data/lib/helpers.rb

@@ -17,7 +17,8 @@ def colorize(str, color_name)
   str.to_s.colorize(color_name)
 end
 
-def color(critical, warn, value, str)
+def color(critical, warn, value, str = nil)
+  str = value unless str
   color_level = if value >= critical
             :red
           elsif value < critical && value >= warn

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
@@ -71,7 +83,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 +107,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma-status
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Yoann Lecuyer