X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..5844c5bc2edf22e4d6a4316f887adf758584a008:/cookbooks/munin/files/default/plugins/api_waits_

diff --git a/cookbooks/munin/files/default/plugins/api_waits_ b/cookbooks/munin/files/default/plugins/api_waits_
index f78152665..f575dad1c 100755
--- a/cookbooks/munin/files/default/plugins/api_waits_
+++ b/cookbooks/munin/files/default/plugins/api_waits_
@@ -1,18 +1,18 @@
 #!/usr/bin/ruby
 
-require 'rubygems'
-require 'date'
-require 'hpricot'
-require 'open-uri'
+require "rubygems"
+require "date"
+require "hpricot"
+require "open-uri"
 
 def uri_and_times_from_status(server)
   file = open("http://#{server}/server-status").read
   doc = Hpricot.parse(file)
-  tables = doc / 'table'
-  rows = (tables[0] / 'tr')[1..-1]
-  data = rows.collect { |r| (r  / 'td').collect(&:inner_html) }
+  tables = doc / "table"
+  rows = (tables[1] / "tr")[1..-1]
+  data = rows.collect { |r| (r / "td").collect(&:inner_html) }
   # filter where the PID is numeric, status is 'W' and host matches the server
-  matching_data = data.select { |r| (r[1].to_i > 0) && r[3].match(/W/) && r[11].match(server) }
+  matching_data = data.select { |r| r[1].to_i.positive? && r[3].match(/W/) && r[11].match(server) }
   # return URI and number of seconds processing for each request
   matching_data.collect { |r| [r[12], r[5].to_i] }
 end
@@ -26,26 +26,26 @@ CALL_TYPES = {
   :trkpts => "GPX trackpoints calls",
   :web => "Web site traffic",
   :other => "Other API calls"
-}
+}.freeze
 
 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
 
 server = $PROGRAM_NAME.match("api_waits_(.*)")[1]
 
-if ARGV[0] == 'config'
+if ARGV[0] == "config"
   puts "graph_title Wait times for active requests"
   puts "graph_vlabel Average time of requests"
   puts "graph_category api"
@@ -54,7 +54,7 @@ if ARGV[0] == 'config'
 else
   counts = uri_and_times_from_status(server)
            .collect { |x, y| [categorise_uri(x), y] }
-           .each_with_object(Hash.new) do |h, e|
+           .each_with_object({}) do |e, h|
     category, time = e
     if h.key? category
       h[category] += [time]
@@ -63,9 +63,9 @@ else
     end
   end
 
-  CALL_TYPES.keys.each do |type|
+  CALL_TYPES.each_key do |type|
     count = counts[type] || [0]
-    avg = count.inject(0) { |a, e| a + e } / (1.0 * count.length)
+    avg = count.inject(0) { |acc, elem| acc + elem } / (1.0 * count.length)
     puts "#{type}.value #{avg}"
   end
 end