From 993887e37f1933b305a1bbcf323d164f22dcb684 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 31 Oct 2016 21:30:44 +0000 Subject: [PATCH] Fix rubocop warnings --- cookbooks/munin/files/default/plugins/api_waits_ | 2 +- cookbooks/rsyncd/recipes/default.rb | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cookbooks/munin/files/default/plugins/api_waits_ b/cookbooks/munin/files/default/plugins/api_waits_ index 49216861a..6be9fc6f5 100755 --- a/cookbooks/munin/files/default/plugins/api_waits_ +++ b/cookbooks/munin/files/default/plugins/api_waits_ @@ -65,7 +65,7 @@ else CALL_TYPES.keys.each 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 diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb index deaf9a0d2..b14e2f405 100644 --- a/cookbooks/rsyncd/recipes/default.rb +++ b/cookbooks/rsyncd/recipes/default.rb @@ -25,15 +25,19 @@ hosts_deny = {} node[:rsyncd][:modules].each do |name, details| hosts_allow[name] = details[:hosts_allow] || [] - hosts_allow[name] |= search(:node, details[:nodes_allow]).collect do |n| - n.ipaddresses(:role => :external) - end.flatten if details[:nodes_allow] + if details[:nodes_allow] + hosts_allow[name] |= search(:node, details[:nodes_allow]).collect do |n| + n.ipaddresses(:role => :external) + end.flatten + end hosts_deny[name] = details[:hosts_deny] || [] + next unless details[:nodes_deny] + hosts_deny[name] |= search(:node, details[:nodes_deny]).collect do |n| n.ipaddresses(:role => :external) - end.flatten if details[:nodes_deny] + end.flatten end package "rsync" -- 2.39.5