check_passenger 1.0 → 1.1.0

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 lib = File.expand_path('../lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 

data/test/test_nagios_check.rb

@@ -10,10 +10,10 @@ describe CheckPassenger::NagiosCheck do
   describe '#nagios_status' do
     it 'returns the correct status' do
       assert_equal :ok, @obj.send(:nagios_status, 2)
-      assert_equal :ok, @obj.send(:nagios_status, 2, { warn: '3' })
-      assert_equal :warn, @obj.send(:nagios_status, 6, { warn: '5' })
-      assert_equal :warn, @obj.send(:nagios_status, -1, { warn: '5' })
-      assert_equal :crit, @obj.send(:nagios_status, 6, { warn: '5', crit: '5' })
+      assert_equal :ok, @obj.send(:nagios_status, 2, warn: '3')
+      assert_equal :warn, @obj.send(:nagios_status, 6, warn: '5')
+      assert_equal :warn, @obj.send(:nagios_status, -1, warn: '5')
+      assert_equal :crit, @obj.send(:nagios_status, 6, warn: '5', crit: '5')
     end
   end
 

data/test/test_parser.rb

@@ -10,7 +10,7 @@ describe CheckPassenger::Parser do
         ----------- General information -----------
         Max pool size : 40
         Processes     : 26
-        Requests in top-level queue : 0
+        Requests in top-level queue : 2
 
         ----------- Application groups -----------
       HEREDOC
@@ -19,25 +19,25 @@ describe CheckPassenger::Parser do
     it 'correctly handles process life' do
       begin
         parser = CheckPassenger::Parser.new(@sample_output)
-      rescue Exception => e
-        assert false, 'Exception %s raised with message: %s' % [e.class.to_s, e.to_s]
+      rescue e
+        assert false, "Exception #{e.class} raised with message: #{e}"
       end
 
       last_used = '23x 4d 5h 4s'
       assert_raises CheckPassenger::StatusOutputError do
-        parser.send(:'is_process_alive?', last_used)
+        parser.send(:'process_alive?', last_used)
       end
 
       last_used = '4d 5h 4s'
 
       begin
         life_in_seconds = parser.send(:life_to_seconds, last_used)
-      rescue Exception => e
-        assert false, 'Exception %s raised with message: %s' % [e.class.to_s, e.to_s]
+      rescue e
+        assert false, "Exception #{e.class} raised with message: #{e}"
       end
       assert_equal 363_604, life_in_seconds
 
-      refute parser.send(:'is_process_alive?', last_used)
+      refute parser.send(:'process_alive?', last_used)
     end
 
     it 'correctly parses max pool size' do
@@ -55,6 +55,11 @@ describe CheckPassenger::Parser do
       end
     end
 
+    it 'correctly parses requests in top-level queue' do
+      parser = CheckPassenger::Parser.new(@sample_output)
+      assert_equal 2, parser.top_level_request_count
+    end
+
     it 'gets Passenger version' do
       parser = CheckPassenger::Parser.new(@sample_output)
       assert_respond_to parser, :passenger_version
@@ -79,6 +84,10 @@ describe CheckPassenger::Parser do
       assert_equal 40, @parser.max_pool_size
     end
 
+    it 'reports the number of requests in top-level queue' do
+      assert_equal 10, @parser.top_level_request_count
+    end
+
     describe 'for all applications' do
       it 'reports all memory used' do
         refute @parser.memory.nil?
@@ -92,6 +101,10 @@ describe CheckPassenger::Parser do
       it 'reports the number of live processes' do
         assert_equal 9, @parser.live_process_count
       end
+
+      it 'reports the number of requests queued' do
+        assert_equal 60, @parser.request_count
+      end
     end
 
     describe 'for a specific application' do
@@ -108,6 +121,10 @@ describe CheckPassenger::Parser do
         assert_equal 4, @parser.live_process_count('application_4')
       end
 
+      it 'reports the requests queued' do
+        assert_equal 12, @parser.request_count('application_2')
+      end
+
       it 'raises exception if term matches multiple apps' do
         assert_raises CheckPassenger::MultipleApplicationsError do
           @parser.memory('application')
@@ -133,6 +150,10 @@ describe CheckPassenger::Parser do
       assert_equal 40, @parser.max_pool_size
     end
 
+    it 'reports the number of requests in top-level queue' do
+      assert_equal 12, @parser.top_level_request_count
+    end
+
     describe 'for all applications' do
       it 'reports all memory used' do
         refute @parser.memory.nil?
@@ -141,7 +162,7 @@ describe CheckPassenger::Parser do
 
       it 'reports the total count of processes' do
         assert_equal 22, @parser.process_count
-    end
+      end
 
       it 'reports the number of live processes' do
         assert_equal 7, @parser.live_process_count
@@ -161,6 +182,11 @@ describe CheckPassenger::Parser do
         assert_equal 4, @parser.live_process_count('application_1')
         assert_equal 0, @parser.live_process_count('application_2')
       end
+
+      it 'reports the number of requests in application queue' do
+        assert_equal 21, @parser.request_count('application_1')
+        assert_equal 22, @parser.request_count('application_2')
+      end
     end
   end
 end

data/test/test_passenger_status.rb

@@ -16,8 +16,8 @@ describe CheckPassenger::PassengerStatus do
   it 'can find the executable in a directory' do
     CheckPassenger::PassengerStatus.path = File.dirname(__FILE__)
     begin
-      output = CheckPassenger::PassengerStatus.run
-    rescue Exception => e
+      CheckPassenger::PassengerStatus.run
+    rescue e
       assert false, e.to_s
     end
   end

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: check_passenger
 version: !ruby/object:Gem::Version
-  version: '1.0'
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Alvaro Redondo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
 description: 
@@ -99,7 +88,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".codeclimate.yml"
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,33 +121,26 @@ files:
 homepage: https://github.com/aredondo/check_passenger
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2306355991957231543
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2306355991957231543
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Nagios check to monitor Passenger processes and memory
 test_files:
 - test/passenger-status