Merge pull request #109 from zerebubuth/munin-dump

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

diff --git a/cookbooks/munin/files/default/plugins/passenger_memory b/cookbooks/munin/files/default/plugins/passenger_memory
index a894afc900da123554747da3b6267d60b0655147..1aa9a77640fc6b7f1de49977bc0346aa379d67a0 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/passenger_memory
+++ b/cookbooks/munin/files/default/plugins/passenger_memory
@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 # put in /etc/munin/plugins and restart munin-node
 # by Dan Manges, http://www.dcmanges.com/blog/rails-application-visualization-with-munin
-# NOTE: you might need to add munin to allow passwordless sudo for passenger-memory-stats 
- 
+# NOTE: you might need to add munin to allow passwordless sudo for passenger-memory-stats
+
+require "English"
+
 def output_config
   puts <<-END
 graph_args --base 1024 -l 0 --vertical-label bytes --upper-limit 4056231936
@@ -13,20 +15,19 @@ memory.label memory
 END
   exit 0
 end
- 
+
 def output_values
-  status = `/usr/sbin/passenger-memory-stats | tail -1` 
-  unless $?.success?
+  status = `/usr/sbin/passenger-memory-stats | tail -1`
+  unless $CHILD_STATUS.success?
     $stderr.puts "failed executing passenger-memory-stats"
     exit 1
   end
   status =~ /(\d+\.\d+)/
-  puts "memory.value #{($1.to_f * 1024 * 1024).round}"
+  puts "memory.value #{(Regexp.last_match[1].to_f * 1024 * 1024).round}"
 end
- 
+
 if ARGV[0] == "config"
   output_config
 else
   output_values
 end
-