X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Flib%2Fpuppet%2Fprovider%2Frabbitmqctl.rb;fp=3rdparty%2Fmodules%2Frabbitmq%2Flib%2Fpuppet%2Fprovider%2Frabbitmqctl.rb;h=bfc27cf9f73e201b6f0152a4797c2f521739c28a;hb=921e69100a563cf143f56a3905d8362336d939ff;hp=d236645697487f277f6267b12394e806c906fed2;hpb=b54f52d2899c5785923c804fdfbba0782c147da4;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb b/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb
index d23664569..bfc27cf9f 100644
--- a/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb
+++ b/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb
@@ -1,10 +1,10 @@
 class Puppet::Provider::Rabbitmqctl < Puppet::Provider
   initvars
-  commands :rabbitmqctl => 'rabbitmqctl'
+  commands rabbitmqctl: 'rabbitmqctl'
 
   def self.rabbitmq_version
     output = rabbitmqctl('-q', 'status')
-    version = output.match(/\{rabbit,"RabbitMQ","([\d\.]+)"\}/)
+    version = output.match(%r{\{rabbit,"RabbitMQ","([\d\.]+)"\}})
     version[1] if version
   end
 
@@ -13,13 +13,13 @@ class Puppet::Provider::Rabbitmqctl < Puppet::Provider
   # Limit each query time by 'timeout'.
   # For example:
   #   users = self.class.run_with_retries { rabbitmqctl 'list_users' }
-  def self.run_with_retries(count=30, step=6, timeout=10)
-    count.times do |n|
+  def self.run_with_retries(count = 30, step = 6, timeout = 10)
+    count.times do |_n|
       begin
-        output = Timeout::timeout(timeout) do
+        output = Timeout.timeout(timeout) do
           yield
         end
-      rescue Puppet::ExecutionFailure, Timeout
+      rescue Puppet::ExecutionFailure, Timeout::Error
         Puppet.debug 'Command failed, retrying'
         sleep step
       else
@@ -29,5 +29,4 @@ class Puppet::Provider::Rabbitmqctl < Puppet::Provider
     end
     raise Puppet::Error, "Command is still failing after #{count * step} seconds expired!"
   end
-
 end