lib/elasticsearch/transport/transport/http/faraday.rb in elasticsearch-transport-6.8.3 vs lib/elasticsearch/transport/transport/http/faraday.rb in elasticsearch-transport-7.0.0.pre

- old
+ new

@@ -1,8 +1,21 @@ -# Licensed to Elasticsearch B.V under one or more agreements. -# Elasticsearch B.V licenses this file to you under the Apache 2.0 License. -# See the LICENSE file in the project root for more information +# Licensed to Elasticsearch B.V. under one or more contributor +# license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright +# ownership. Elasticsearch B.V. licenses this file to you under +# the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. module Elasticsearch module Transport module Transport module HTTP @@ -18,11 +31,11 @@ # Performs the request by invoking {Transport::Base#perform_request} with a block. # # @return [Response] # @see Transport::Base#perform_request # - def perform_request(method, path, params={}, body=nil, headers=nil, opts={}) + def perform_request(method, path, params={}, body=nil, headers=nil) super do |connection, url| headers = headers || connection.connection.headers response = connection.connection.run_request(method.downcase.to_sym, url, @@ -45,10 +58,10 @@ # Returns an array of implementation specific connection errors. # # @return [Array] # def host_unreachable_exceptions - [::Faraday::ConnectionFailed, ::Faraday::TimeoutError] + [::Faraday::Error::ConnectionFailed, ::Faraday::Error::TimeoutError] end end end end end