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

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

diff --git a/cookbooks/munin/files/default/plugins/passenger_queues b/cookbooks/munin/files/default/plugins/passenger_queues
index 9a67fafc7a528076c48ef9bdbc0a3f85efded50b..60be63389f957160cc38ae9646ed7bf75e787b21 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/passenger_queues
+++ b/cookbooks/munin/files/default/plugins/passenger_queues
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require "English"
+
 def output_config
   puts <<-END
 graph_category passenger
@@ -13,12 +15,12 @@ end
 
 def output_values
   status = `/usr/sbin/passenger-status`
-  unless $?.success?
+  unless $CHILD_STATUS.success?
     $stderr.puts "failed executing passenger-status"
     exit 1
   end
-  status =~ /Waiting on global queue:\s+(\d+)/
-  puts "global.value #{$1}"
+  status =~ /Requests in top-level queue :\s+(\d+)/
+  puts "global.value #{Regexp.last_match[1]}"
 end
 
 if ARGV[0] == "config"