Fixup passenger munin plugins

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

diff --git a/cookbooks/munin/files/default/plugins/api_calls_num b/cookbooks/munin/files/default/plugins/api_calls_num
index d2f7ea3720b29e562c6592d656dcd71c2639c4d4..c86275e693b1bedd27d3fadab6eb53d6f6369ebe 100755 (executable)
--- a/cookbooks/munin/files/default/plugins/api_calls_num
+++ b/cookbooks/munin/files/default/plugins/api_calls_num
@@ -1,14 +1,14 @@
 #!/usr/bin/ruby
 
-require 'rubygems'
-require 'date'
-gem 'home_run', '>= 0'
-require 'apache_log_regex'
+require "rubygems"
+require "date"
+gem "home_run", ">= 0"
+require "apache_log_regex"
 
 NUM_LINES = 10000
 
 def uris_from_logs
-  lines = Array.new
+  lines = []
   max_time = nil
   min_time = nil
   parser = ApacheLogRegex.new('%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %x')
@@ -20,7 +20,7 @@ def uris_from_logs
       min_time = [min_time, t].compact.min
       max_time = [max_time, t].compact.max
       lines << uri
-    rescue ApacheLogRegex::ParseError => e
+    rescue ApacheLogRegex::ParseError
       # nil
     end
   end
@@ -42,18 +42,18 @@ def categorise_uri(line)
   uri = line.split(" ")[1]
 
   case uri
-  when /api\/0\.6\/map/ then :map
-  when /api\/0\.6\/changeset\/[0-9]*\/upload/ then :upload
-  when /api\/0\.6\/amf/ then :amf
-  when /api\/0\.6\/(node|way|relation)\/[0-9]*\/history/ then :history
-  when /api\/0\.6\/(node|way|relation)\/[0-9]*\/full/ then :full
-  when /api\/0\.6\/trackpoints/ then :trkpts
-  when /api\/0\.6\// then :other
+  when %r{api/0\.6/map} then :map
+  when %r{api/0\.6/changeset/[0-9]*/upload} then :upload
+  when %r{api/0\.6/amf} then :amf
+  when %r{api/0\.6/(node|way|relation)/[0-9]*/history} then :history
+  when %r{api/0\.6/(node|way|relation)/[0-9]*/full} then :full
+  when %r{api/0\.6/trackpoints} then :trkpts
+  when %r{api/0\.6/} then :other
   else :web
   end
 end
 
-if ARGV[0] == 'config'
+if ARGV[0] == "config"
   puts "graph_title Requests processed"
   puts "graph_vlabel Number of requests per minute"
   puts "graph_category api"
@@ -62,15 +62,14 @@ if ARGV[0] == 'config'
 else
   min_time, max_time, lines = uris_from_logs
   delta_t = (max_time - min_time).to_f * 24 * 60
-  counts = lines.
-      collect {|x| categorise_uri(x)}.
-      inject(Hash.new) do |h, e|
-    if h.has_key? e
+  counts = lines
+           .collect { |x| categorise_uri(x) }
+           .each_with_object({}) do |e, h|
+    if h.key? e
       h[e] += 1
     else
       h[e] = 1
     end
-    h
   end
 
   CALL_TYPES.keys.each do |type|