puma-status 0.1.5 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64511132fd67f2ec94455b13dd573b45e0bb7983efcd3f6dbcb12cf9dcddc8dd
-  data.tar.gz: e8922a9d6e9ce2e47fc79cb50d835cc503053683f84f64e7c54656d3952b7944
+  metadata.gz: 46a19b27c114c23f83f652c395c9157d2581a0c688a42c2784c3660bef0f3277
+  data.tar.gz: 94a7a2cbee9aa0a082ddc38b61a32a4d2db3c3f8ad44a70b546a67b4a884dde8
 SHA512:
-  metadata.gz: fc719fab589f2ce0ebb79dfad1b071256fa258b8633d61033f867843169e27c500442c62208bcda7aafe05017f7d95bddf818eb16442101aa90048317abdf867
-  data.tar.gz: c77a65f3a8dd2381cb788b8e695938cc34c0a96b9b3a6829ac382eddf43ca090fe228660ab07b6d9d84a2cdf804eb77fa78e2611d8f7b0af3e048a1eb360c9f4
+  metadata.gz: f3b70ede2ef3c33c2436efe7da75faa5e858c5042572d07d26204487ea61a60d31cd2f9497502a5f8ae00bf00ecbdae0ac5ea6bceba1bfeec28036e9e18dc39c
+  data.tar.gz: f930e67b9deff2945d5f3a02c5635caf808b17a927527e533a3b7894e7b91ac59670c114c6fbb066a3be325fc9a78dc62cbfad12d26020a8e588b2a152d5e436

data/lib/core.rb

@@ -42,19 +42,18 @@ def hydrate_stats(stats, puma_state, state_file_path)
   end
 end
 
-def display_stats(stats)
+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))}"
 
-  puts master_line
-
-  stats.workers.each do |wstats|
+  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
-
-    puts worker_line
+    worker_line
   end
+
+  output.join("\n")
 end

data/lib/helpers.rb

@@ -4,17 +4,28 @@ 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)
+  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,5 +1,6 @@
 require_relative './helpers'
 require_relative './core.rb'
+require 'parallel'
 
 def run
   debug "puma-status"
@@ -10,8 +11,28 @@ def run
     exit -1
   end
 
-  ARGV.each do |state_file_path|
-    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
+      errors << "#{warn(state_file_path)} doesn't exists"
+      nil
+    rescue Errno::EISDIR
+      errors << "#{warn(state_file_path)} isn't a state file"
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma-status
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: '0.2'
 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,15 +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: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Command-line tool for puma to display information about running request/process