X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..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 73e2615d0..f56fa4831 100755
--- a/cookbooks/munin/files/default/plugins/api_calls_
+++ b/cookbooks/munin/files/default/plugins/api_calls_
@@ -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|