X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..21958591555b0b80370e944e3128ac5d533c281d:/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 f74e3a5cd..f78152665 100755
--- a/cookbooks/munin/files/default/plugins/api_waits_
+++ b/cookbooks/munin/files/default/plugins/api_waits_
@@ -43,7 +43,7 @@ def categorise_uri(line)
   end
 end
 
-server = $0.match("api_waits_(.*)")[1]
+server = $PROGRAM_NAME.match("api_waits_(.*)")[1]
 
 if ARGV[0] == 'config'
   puts "graph_title Wait times for active requests"
@@ -52,21 +52,20 @@ if ARGV[0] == 'config'
   CALL_TYPES.each { |k, v| puts "#{k}.label #{v}" }
 
 else
-  counts = uri_and_times_from_status(server).
-      collect { |x, y| [categorise_uri(x), y] }.
-      inject(Hash.new) do |h, e|
+  counts = uri_and_times_from_status(server)
+           .collect { |x, y| [categorise_uri(x), y] }
+           .each_with_object(Hash.new) do |h, e|
     category, time = e
-    if h.has_key? category
+    if h.key? category
       h[category] += [time]
     else
       h[category] = [time]
     end
-    h
   end
 
   CALL_TYPES.keys.each do |type|
     count = counts[type] || [0]
-    avg = count.inject(0) { |x, y|x + y } / (1.0 * count.length)
+    avg = count.inject(0) { |a, e| a + e } / (1.0 * count.length)
     puts "#{type}.value #{avg}"
   end
 end