Merge remote-tracking branch 'github/pull/79'

[chef.git] / cookbooks / munin / files / default / plugins / passenger_processes

diff --git a/cookbooks/munin/files/default/plugins/passenger_processes b/cookbooks/munin/files/default/plugins/passenger_processes
index d89d0412e9139d2fac1a0ec39f908ef4b6ffa413..39842a04f7585ae1185bfd23ac3fab97d9cba313 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/passenger_processes
+++ b/cookbooks/munin/files/default/plugins/passenger_processes
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
 #!/usr/bin/env ruby
 

+require "English"
+

 def output_config
   puts <<-END
 graph_category passenger
 def output_config
   puts <<-END
 graph_category passenger


@@ -18,15 +20,15 @@ end
 
 def output_values
   status = `/usr/sbin/passenger-status`
 
 def output_values
   status = `/usr/sbin/passenger-status`

-  unless $?.success?
+  unless $CHILD_STATUS.success?

     $stderr.puts "failed executing passenger-status"
     exit 1
   end
   status =~ /active\s+=\s+(\d+)/
     $stderr.puts "failed executing passenger-status"
     exit 1
   end
   status =~ /active\s+=\s+(\d+)/

-  puts "active.value #{$1}"
+  puts "active.value #{Regexp.last_match[1]}"

 
   status =~ /inactive\s+=\s+(\d+)/
 
   status =~ /inactive\s+=\s+(\d+)/

-  puts "inactive.value #{$1}"
+  puts "inactive.value #{Regexp.last_match[1]}"

 end
 
 if ARGV[0] == "config"
 end
 
 if ARGV[0] == "config"