diff options
| author | Luke Kanies <luke@madstop.com> | 2008-12-02 16:26:54 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-12-02 16:26:54 -0600 |
| commit | 99a9b5a045af6f1c68619792a45603cbe450652d (patch) | |
| tree | 579963d464c0529d4e9250f937d495e415f1e867 /lib/puppet/network | |
| parent | f73e13e7464edab73443857d628602b89361c220 (diff) | |
| parent | 278bfe83015312292360f727d6532a143610db0d (diff) | |
| download | puppet-99a9b5a045af6f1c68619792a45603cbe450652d.tar.gz puppet-99a9b5a045af6f1c68619792a45603cbe450652d.tar.xz puppet-99a9b5a045af6f1c68619792a45603cbe450652d.zip | |
Merge branch '0.24.x'
Conflicts:
bin/puppetca
lib/puppet/type/group.rb
lib/puppet/type/tidy.rb
lib/puppet/util/settings.rb
Also edited the following files so tests will pass:
lib/puppet/type/component.rb
spec/unit/ssl/certificate_request.rb
spec/unit/type/computer.rb
spec/unit/type/mcx.rb
spec/unit/type/resources.rb
spec/unit/util/settings.rb
spec/unit/util/storage.rb
test/ral/type/zone.rb
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/client/master.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/network/xmlrpc/client.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index fe257db2b..d24fd7df7 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -487,7 +487,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client return unless Puppet[:splay] return if splayed? - time = rand(Integer(Puppet[:splaylimit])) + time = rand(Integer(Puppet[:splaylimit]) + 1) Puppet.info "Sleeping for %s seconds (splay is enabled)" % time sleep(time) @splayed = true diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index c79f91d57..37ace2101 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -73,7 +73,9 @@ module Puppet::Network rescue Timeout::Error => detail Puppet.err "Connection timeout calling %s.%s: %s" % [namespace, method, detail.to_s] - raise XMLRPCClientError.new("Connection Timeout").set_backtrace(detail.backtrace) + error = XMLRPCClientError.new("Connection Timeout") + error.set_backtrace(detail.backtrace) + raise error rescue => detail if detail.message =~ /^Wrong size\. Was \d+, should be \d+$/ Puppet.warning "XMLRPC returned wrong size. Retrying." |