add e2e test

Author: ylecuyer

Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'puma'

Gemfile.lock

@@ -11,7 +11,10 @@ GEM
     climate_control (0.2.0)
     diff-lcs (1.5.0)
     net_http_unix (0.2.2)
+    nio4r (2.7.4)
     parallel (1.24.0)
+    puma (7.0.3)
+      nio4r (~> 2.0)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -32,6 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   climate_control (~> 0.2)
+  puma
   puma-status!
   rspec (~> 3.8)
   timecop (~> 0.9)

lib/core.rb

@@ -48,10 +48,16 @@ def get_memory_from_top(raw_memory)
 MEM_COLUMN = 5
 CPU_COLUMN = 8
 OPEN3_STDOUT = 1
+OPEN3_STDERR = 2
 
 def get_top_stats(pids)
   pids.each_slice(19).inject({}) do |res, pids19|
-    top_result = Open3.popen3({ 'LC_ALL' => 'C' }, "top -b -n 1 -p #{pids19.map(&:to_i).join(',')}")[OPEN3_STDOUT].read
+    top = Open3.popen3({ 'LC_ALL' => 'C' }, "top -b -n 1 -p #{pids19.map(&:to_i).join(',')}")
+    if error = top[OPEN3_STDERR].read.strip and !error.empty?
+      warn "Error when calling top: #{error}"
+      next res
+    end
+    top_result = top[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

lib/puma-status.rb

@@ -3,17 +3,21 @@
 require 'parallel'
 
 def run
+  run_argv(ARGV)
+end
+
+def run_argv(argv)
   debug "puma-status"
 
-  if ARGV.count < 1
+  if argv.count < 1
     puts "Call with:"
     puts "\tpuma-status path/to/puma.state"
     exit -1
   end
 
   errors = []
-  
-  outputs = Parallel.map(ARGV, in_threads: ARGV.count) do |state_file_path|
+
+  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))

spec/e2e_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+require 'puma-status'
+
+describe 'e2e' do
+  it 'works' do
+    File.delete('/tmp/test_server.state') if File.exist?('/tmp/test_server.state')
+    File.delete('/tmp/test_server.sock') if File.exist?('/tmp/test_server.sock')
+    File.delete('/tmp/test_server_control.sock') if File.exist?('/tmp/test_server_control.sock')
+
+    # start process test_server.rb
+    pid = spawn('ruby spec/test_server.rb')
+
+    # wait until /tmp/test_server.state exists
+    until File.exist?('/tmp/test_server.state')
+      sleep 0.1
+    end
+
+    expect {
+      expect {
+        run_argv(['/tmp/test_server.state'])
+      }.not_to output.to_stderr
+    }.to output(/CPU/).to_stdout
+
+    Process.kill('TERM', pid)
+    Process.wait(pid)
+  end
+end

spec/test_server.rb

@@ -0,0 +1,29 @@
+require 'puma'
+
+puma_version = Puma::Const::PUMA_VERSION
+ruby_version = RUBY_VERSION
+
+# Rack app
+app = proc { |env| [200, { 'Content-Type' => 'text/plain' }, ["Test server: puma: #{puma_version} ruby: #{ruby_version}\n"]] }
+
+Puma::Launcher.new(
+  Puma::Configuration.new do |user_config|
+    user_config.bind 'unix:///tmp/test_server.sock'
+    user_config.workers 1
+    user_config.threads 1, 1
+    user_config.app app
+    user_config.activate_control_app 'unix:///tmp/test_server_control.sock', { auth_token: 'secret_token' }
+    user_config.state_path '/tmp/test_server.state'
+    user_config.stdout_redirect '/tmp/test_server.log', '/tmp/test_server.err', true
+  end,
+  {
+    log_writer: Puma::LogWriter.null,
+  }
+).run
+
+# To run this server, execute:
+#  ruby test_server.rb
+#  Then, you can test it with:
+#  curl --unix-socket /tmp/test_server.sock http://localhost/
+#  You should see the output with Puma and Ruby versions.
+#  To stop the server, simply interrupt the process (Ctrl+C).