Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397812 )

Change subject: puppet_statsd: fix three RuboCop offenses
......................................................................

puppet_statsd: fix three RuboCop offenses

- Layout/SpaceAfterComma
- Lint/UselessAssignment
- Style/RedundantSelf

Change-Id: Ic223244a5c8769e9c3d52527000017e02b99af83
---
M .rubocop_todo.yml
M modules/puppet_statsd/lib/puppet/reports/statsd.rb
2 files changed, 6 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/397812/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b846cb4..aa1f615 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -8,7 +8,6 @@
 
 Lint/UselessAssignment:
   Exclude:
-    - 'modules/puppet_statsd/lib/puppet/reports/statsd.rb'
     - 'modules/service/Rakefile'
     - 'modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb'
 
@@ -92,10 +91,6 @@
   Exclude:
     - 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb'
 
-Style/RedundantSelf:
-  Exclude:
-    - 'modules/puppet_statsd/lib/puppet/reports/statsd.rb'
-
 Style/RegexpLiteral:
   Exclude:
     - 'modules/bacula/spec/classes/bacula_client_spec.rb'
@@ -121,7 +116,6 @@
 Layout/SpaceAfterComma:
   Exclude:
     - 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb'
-    - 'modules/puppet_statsd/lib/puppet/reports/statsd.rb'
     - 'modules/wmflib/lib/puppet/parser/functions/ini.rb'
 
 Layout/SpaceAroundEqualsInParameterDefault:
diff --git a/modules/puppet_statsd/lib/puppet/reports/statsd.rb 
b/modules/puppet_statsd/lib/puppet/reports/statsd.rb
index becf69d..16a13f4 100644
--- a/modules/puppet_statsd/lib/puppet/reports/statsd.rb
+++ b/modules/puppet_statsd/lib/puppet/reports/statsd.rb
@@ -5,7 +5,9 @@
 require 'erb'
 
 Puppet::Reports.register_report(:statsd) do
-    desc = 'Send Puppet metrics to StatsD'
+    desc <<-DESC
+      Send Puppet metrics to StatsD
+    DESC
 
     def load_config
         config_file = File.join Puppet.settings[:confdir], 'statsd.yaml'
@@ -15,12 +17,12 @@
 
     def process
         config = load_config
-        hostname = self.host
-        Puppet.notice "Sending metrics for #{self.host} to "\
+        hostname = host
+        Puppet.notice "Sending metrics for #{host} to "\
             "#{config[:statsd_host]}:#{config[:statsd_port]}.."
 
         socket = UDPSocket.new
-        self.metrics['time'].values.each do |metric,description,value|
+        metrics['time'].values.each do |metric, description, value|
             value = (value * 1000).round  # Convert fractional seconds to 
whole miliseconds
             name = ERB.new(config[:metric_format]).result(binding)
             socket.send("#{name}:#{value}|ms", 0, config[:statsd_host], 
config[:statsd_port])

-- 
To view, visit https://gerrit.wikimedia.org/r/397812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic223244a5c8769e9c3d52527000017e02b99af83
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to