diff options
Diffstat (limited to 'lib/puppet/network/xmlrpc')
| -rw-r--r-- | lib/puppet/network/xmlrpc/client.rb | 16 | ||||
| -rw-r--r-- | lib/puppet/network/xmlrpc/processor.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/network/xmlrpc/webrick_servlet.rb | 16 |
3 files changed, 10 insertions, 30 deletions
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index 828b8a77a..86b1fbd0b 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -79,9 +79,7 @@ module Puppet::Network return :retry end ["certificate verify failed", "hostname was not match", "hostname not match"].each do |str| - if detail.message.include?(str) - Puppet.warning "Certificate validation failed; consider using the certname configuration option" - end + Puppet.warning "Certificate validation failed; consider using the certname configuration option" if detail.message.include?(str) end raise XMLRPCClientError, "Certificates were not trusted: #{detail}" end @@ -104,9 +102,7 @@ module Puppet::Network return :retry end ["certificate verify failed", "hostname was not match", "hostname not match"].each do |str| - if detail.message.include?(str) - Puppet.warning "Certificate validation failed; consider using the certname configuration option" - end + Puppet.warning "Certificate validation failed; consider using the certname configuration option" if detail.message.include?(str) end raise XMLRPCClientError, "Certificates were not trusted: #{detail}" end @@ -154,9 +150,7 @@ module Puppet::Network end def http - unless @http - @http = Puppet::Network::HttpPool.http_instance(host, port, true) - end + @http = Puppet::Network::HttpPool.http_instance(host, port, true) unless @http @http end @@ -196,9 +190,7 @@ module Puppet::Network # or we've just downloaded certs and we need to create new http instances # with the certs added. def recycle_connection - if http.started? - http.finish - end + http.finish if http.started? @http = nil self.http # force a new one end diff --git a/lib/puppet/network/xmlrpc/processor.rb b/lib/puppet/network/xmlrpc/processor.rb index 14f91d8b4..e016b177b 100644 --- a/lib/puppet/network/xmlrpc/processor.rb +++ b/lib/puppet/network/xmlrpc/processor.rb @@ -58,9 +58,7 @@ module Puppet::Network 1, detail.to_s ) rescue Puppet::Error => detail - if Puppet[:trace] - puts detail.backtrace - end + puts detail.backtrace if Puppet[:trace] Puppet.err detail.to_s error = ::XMLRPC::FaultException.new( 1, detail.to_s @@ -68,9 +66,7 @@ module Puppet::Network error.set_backtrace detail.backtrace raise error rescue => detail - if Puppet[:trace] - puts detail.backtrace - end + puts detail.backtrace if Puppet[:trace] Puppet.err "Could not call: #{detail}" error = ::XMLRPC::FaultException.new(1, detail.to_s) error.set_backtrace detail.backtrace diff --git a/lib/puppet/network/xmlrpc/webrick_servlet.rb b/lib/puppet/network/xmlrpc/webrick_servlet.rb index f58286c3a..a3022dbe9 100644 --- a/lib/puppet/network/xmlrpc/webrick_servlet.rb +++ b/lib/puppet/network/xmlrpc/webrick_servlet.rb @@ -10,9 +10,7 @@ module Puppet::Network::XMLRPC # This is a hackish way to avoid an auth message every time we have a # normal operation def self.log(msg) - unless defined?(@logs) - @logs = {} - end + @logs = {} unless defined?(@logs) if @logs.include?(msg) @logs[msg] += 1 else @@ -51,9 +49,7 @@ module Puppet::Network::XMLRPC "unsupported method `#{request.request_method}'." end - if parse_content_type(request['Content-type']).first != "text/xml" - raise WEBrick::HTTPStatus::BadRequest - end + raise WEBrick::HTTPStatus::BadRequest if parse_content_type(request['Content-type']).first != "text/xml" length = (request['Content-length'] || 0).to_i @@ -61,14 +57,10 @@ module Puppet::Network::XMLRPC data = request.body - if data.nil? or data.size != length - raise WEBrick::HTTPStatus::BadRequest - end + raise WEBrick::HTTPStatus::BadRequest if data.nil? or data.size != length resp = process(data, client_request(request)) - if resp.nil? or resp.size <= 0 - raise WEBrick::HTTPStatus::InternalServerError - end + raise WEBrick::HTTPStatus::InternalServerError if resp.nil? or resp.size <= 0 response.status = 200 response['Content-Length'] = resp.size |