elasticsearch-transport 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 789ec1e3bb9aed97ffd4479cbf02bbad55265088
-  data.tar.gz: 3578fd13952bc2c03b3047114e3e461f87d50410
+  metadata.gz: 44170b2419c63a6ab5d33557fa3d49a7efede792
+  data.tar.gz: 59ec164cf8865491cf0e4c59628d62ce5a9a0dd2
 SHA512:
-  metadata.gz: 08aed8209e065f8c50dcf6bbf1a9cd91b6f78b8e3f574c08f73bd04a6c48427548ea3f164721ec093af3ced98a96c029cdc7ef0a808f8c86426ee8a4294371eb
-  data.tar.gz: 6b99e2a8451e1b5aade9e276b95269b703601eea58d119df7e098c65a6794ecbfa8034057420ef1cad271abbafb4345147dcb5ebf7da70d1471224249acfb3fe
+  metadata.gz: a12ea012f3a6b64322a8542dc21af3cc6ad2c5774c7a632246b429ca0bcfa212c0c9d8ce8925210e403284c612fff5ac037c084e02b297b4439bc75cc6d99ec5
+  data.tar.gz: a9bc5d3679d9ca6925f2e6b45e1961fa879865978b0f10a25edf41b4eda101515393ff10f420996b7796ec50c9ad91c0cf8ebee0665153867e729fc1adbd27f6

data/lib/elasticsearch/transport/transport/base.rb

@@ -34,6 +34,7 @@ module Elasticsearch
           @hosts       = arguments[:hosts]   || []
           @options     = arguments[:options] || {}
           @options[:http] ||= {}
+          @options[:retry_on_status] ||= []
 
           @block       = block
           @connections = __build_connections
@@ -268,7 +269,6 @@ module Elasticsearch
           rescue Elasticsearch::Transport::Transport::ServerError => e
             if @retry_on_status.include?(response.status)
               logger.warn "[#{e.class}] Attempt #{tries} to get response from #{url}" if logger
-              logger.debug "[#{e.class}] Attempt #{tries} to get response from #{url}" if logger
               if tries <= max_retries
                 retry
               else
@@ -312,16 +312,17 @@ module Elasticsearch
           if response.status.to_i >= 300
             __log    method, path, params, body, url, response, nil, 'N/A', duration if logger
             __trace  method, path, params, body, url, response, nil, 'N/A', duration if tracer
-            __log_failed response if logger
 
-            # Swallow the exception when the `ignore` parameter matches response status
+            # Log the failure only when `ignore` doesn't match the response status
+            __log_failed response if logger && !ignore.include?(response.status.to_i)
+
             __raise_transport_error response unless ignore.include?(response.status.to_i)
           end
 
           json     = serializer.load(response.body) if response.body && !response.body.empty? && response.headers && response.headers["content-type"] =~ /json/
           took     = (json['took'] ? sprintf('%.3fs', json['took']/1000.0) : 'n/a') rescue 'n/a' if logger || tracer
 
-          __log   method, path, params, body, url, response, json, took, duration if logger
+          __log   method, path, params, body, url, response, json, took, duration if logger && !ignore.include?(response.status.to_i)
           __trace method, path, params, body, url, response, json, took, duration if tracer
 
           Response.new response.status, json || response.body, response.headers

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "5.0.3"
+    VERSION = "5.0.4"
   end
 end

data/test/integration/client_test.rb

@@ -167,8 +167,12 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
                   logger: (ENV['QUIET'] ? nil : @logger),
                   retry_on_status: 400
 
+        # Set the logger when the `QUIET` option is set
+        @client.transport.logger ||= Logger.new(STDERR)
+
+        @client.transport.logger.stubs(:fatal)
         @client.transport.logger
-          .expects(:debug)
+          .expects(:warn)
           .with( regexp_matches(/Attempt \d to get response/) )
           .times(4)
 
@@ -181,7 +185,9 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     context "when reloading connections" do
       should "keep existing connections" do
         require 'patron' # We need a client with keep-alive
-        client = Elasticsearch::Transport::Client.new host: "127.0.0.1:#{@port}", adapter: :patron, logger: @logger
+        client = Elasticsearch::Transport::Client.new host: "127.0.0.1:#{@port}",
+                                                      adapter: :patron,
+                                                      logger: (ENV['QUIET'] ? nil : @logger)
 
         assert_equal 'Faraday::Adapter::Patron',
                       client.transport.connections.first.connection.builder.handlers.first.name

data/test/unit/transport_base_test.rb

@@ -420,7 +420,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
       @transport.perform_request('GET', '/') {Elasticsearch::Transport::Transport::Response.new 200, '{"foo":"bar"}' }
     end
 
-    should "log a failed Elasticsearch request" do
+    should "log a failed Elasticsearch request as fatal" do
       @block = Proc.new { |c, u| puts "ERROR" }
       @block.expects(:call).returns(Elasticsearch::Transport::Transport::Response.new 500, 'ERROR')
 
@@ -432,6 +432,17 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
       end
     end unless RUBY_1_8
 
+    should "not log a failed Elasticsearch request as fatal" do
+      @block = Proc.new { |c, u| puts "ERROR" }
+      @block.expects(:call).returns(Elasticsearch::Transport::Transport::Response.new 500, 'ERROR')
+
+      @transport.expects(:__log).once
+      @transport.logger.expects(:fatal).never
+
+      # No `BadRequest` error
+      @transport.perform_request('POST', '_search', :ignore => 500, &@block)
+    end unless RUBY_1_8
+
     should "log and re-raise a Ruby exception" do
       @block = Proc.new { |c, u| puts "ERROR" }
       @block.expects(:call).raises(Exception)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -332,8 +332,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  Ruby client for Elasticsearch. See the `elasticsearch` gem for full integration.
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+description: 'Ruby client for Elasticsearch. See the `elasticsearch` gem for full
+  integration.
+
+'
 email:
 - karel.minarik@elasticsearch.org
 executables: []
@@ -399,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Ruby client for Elasticsearch.