lib/scout/command/troubleshoot.rb in scout-5.7.2.pre vs lib/scout/command/troubleshoot.rb in scout-5.7.2.pre.2

- old
+ new

@@ -99,20 +99,14 @@ post.set_form_data(form_data) connection.request(post) end end - def request(url, response_handler, error, &connector) + def request(uri, response_handler, error, &connector) response = nil Timeout.timeout(5 * 60, APITimeoutError) do - http = Net::HTTP.new(url.host, url.port) - if url.is_a? URI::HTTPS - http.use_ssl = true - http.ca_file = File.join( File.dirname(__FILE__), - *%w[.. .. .. data cacert.pem] ) - http.verify_mode = OpenSSL::SSL::VERIFY_PEER | - OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT - end + http = build_http(uri) + response = no_warnings { http.start(&connector) } end case response when Net::HTTPSuccess, Net::HTTPNotModified response_handler[response] unless response_handler.nil?