projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update 3rdparty rabbitmq module
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
rabbitmq
/
lib
/
puppet
/
provider
/
rabbitmqctl.rb
diff --git
a/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb
b/3rdparty/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb
index
d236645
..
bfc27cf
100644
(file)
--- 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
class Puppet::Provider::Rabbitmqctl < Puppet::Provider
initvars
- commands
:rabbitmqctl =>
'rabbitmqctl'
+ commands
rabbitmqctl:
'rabbitmqctl'
def self.rabbitmq_version
output = rabbitmqctl('-q', 'status')
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
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' }
# 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
begin
- output = Timeout
::
timeout(timeout) do
+ output = Timeout
.
timeout(timeout) do
yield
end
yield
end
- rescue Puppet::ExecutionFailure, Timeout
+ rescue Puppet::ExecutionFailure, Timeout
::Error
Puppet.debug 'Command failed, retrying'
sleep step
else
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
raise Puppet::Error, "Command is still failing after #{count * step} seconds expired!"
end
-
end
end