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

diff --git a/cookbooks/munin/files/default/plugins/api_calls_ b/cookbooks/munin/files/default/plugins/api_calls_
index 8cf836d79..f56fa4831 100755
--- a/cookbooks/munin/files/default/plugins/api_calls_
+++ b/cookbooks/munin/files/default/plugins/api_calls_
@@ -10,11 +10,11 @@ def uris_from_status(server)
   doc = Hpricot.parse(file)
   tables = doc / 'table'
   rows = (tables[0] / 'tr')[1..-1]
-  data = rows.collect {|r| (r  / 'td').collect {|x| x.inner_html} }
+  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 > 0) && r[3].match(/W/) && r[11].match(server) }
   # return only the URI part
-  matching_data.collect {|r| r[12]}
+  matching_data.collect { |r| r[12] }
 end
 
 CALL_TYPES = {
@@ -43,7 +43,7 @@ def categorise_uri(line)
   end
 end
 
-server = $0.match("api_calls_(.*)")[1]
+server = $PROGRAM_NAME.match("api_calls_(.*)")[1]
 
 if ARGV[0] == 'config'
   puts "graph_title Active requests"
@@ -52,15 +52,14 @@ if ARGV[0] == 'config'
   CALL_TYPES.each { |k, v| puts "#{k}.label #{v}" }
 
 else
-  counts = uris_from_status(server).
-      collect {|x| categorise_uri(x)}.
-      inject(Hash.new) do |h, e|
-    if h.has_key? e
+  counts = uris_from_status(server)
+           .collect { |x| categorise_uri(x) }
+           .each_with_object(Hash.new) do |h, e|
+    if h.key? e
       h[e] += 1
     else
       h[e] = 1
     end
-    h
   end
 
   CALL_TYPES.keys.each do |type|