check_passenger 0.1 → 0.2

data/TODO.md

@@ -1,6 +1,25 @@
 # Release
 
 - README page.
+- Add summary to command help.
+
+
+# Fix
+
+- Handle error:
+
+```
+It appears that multiple Passenger instances are running. Please select a
+specific one by running:
+
+  passenger-status <PID>
+
+The following Passenger instances are running:
+  PID: 1394
+  PID: 1413
+```
+
+- "1 live processes" should be "1 live process"
 
 
 # Other

data/lib/check_passenger/check.rb

@@ -41,7 +41,7 @@ module CheckPassenger
             counter = parsed_data.send(counter_name.to_sym, app_name)
             output_data << {
               text: '%s %s' % [app_name, COUNTER_LABELS[counter_name.to_sym] % counter],
-              counter: counter_name.to_s, value: counter
+              counter: app_name, value: counter
             }
           end
         end

data/lib/check_passenger/nagios_check.rb

@@ -15,22 +15,29 @@ module CheckPassenger
       end
 
       data = [data] unless data.is_a?(Array)
+      main_status = nil
+      status_data = []
+      perf_data = []
 
       data.each do |line|
         raise ArgumentError, 'No status text provided' unless line.has_key?(:text)
 
-        if line[:counter] and line[:value]
-          puts '%s|%s=%d;%s;%s;%s;%s' % [
-            line[:text],
-            line[:counter], line[:value],
-            line[:warn], line[:crit],
-            line[:min], line[:max]
-          ]
+        if main_status.nil?
+          main_status = line[:text]
         else
-          puts line[:text]
+          status_data << line[:text]
         end
+
+        perf_data << '%s=%d;%s;%s;%s;%s' % [
+          line[:counter], line[:value],
+          line[:warn], line[:crit],
+          line[:min], line[:max]
+        ]
       end
 
+      puts '%s|%s' % [main_status, perf_data.join(' ')]
+      status_data.each { |status_datum| puts status_datum }
+
       exit EXIT_CODES[status]
     end
 

data/lib/check_passenger/version.rb

@@ -1,3 +1,3 @@
 module CheckPassenger
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: check_passenger
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler