elasticsearch-transport 0.4.5 → 0.4.6

data/lib/elasticsearch/transport/transport/sniffer.rb

@@ -28,7 +28,7 @@ module Elasticsearch
         #
         def hosts
           Timeout::timeout(timeout, SnifferTimeoutError) do
-            nodes = transport.perform_request('GET', '_cluster/nodes').body
+            nodes = transport.perform_request('GET', '_nodes').body
             hosts = nodes['nodes'].map do |id,info|
               if matches = info["#{transport.protocol}_address"].to_s.match(RE_URL)
                 # TODO: Implement lightweight "indifferent access" here

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "0.4.5"
+    VERSION = "0.4.6"
   end
 end

data/test/integration/client_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::IntegrationTestCase
   startup do
-    Elasticsearch::Extensions::Test::Cluster.start if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
+    Elasticsearch::Extensions::Test::Cluster.start(nodes: 2) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
   end
 
   context "Elasticsearch client" do
@@ -48,20 +48,20 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       setup do
         @client = Elasticsearch::Client.new \
                     hosts:  ["localhost:#{@port}", "localhost:#{@port+1}" ],
-                    logger: @logger
+                    logger: (ENV['QUIET'] ? nil : @logger)
       end
 
       should "rotate nodes" do
         # Hit node 1
-        response = @client.perform_request 'GET', '_cluster/nodes/_local'
+        response = @client.perform_request 'GET', '_nodes/_local'
         assert_equal 'node-1', response.body['nodes'].to_a[0][1]['name']
 
         # Hit node 2
-        response = @client.perform_request 'GET', '_cluster/nodes/_local'
+        response = @client.perform_request 'GET', '_nodes/_local'
         assert_equal 'node-2', response.body['nodes'].to_a[0][1]['name']
 
         # Hit node 1
-        response = @client.perform_request 'GET', '_cluster/nodes/_local'
+        response = @client.perform_request 'GET', '_nodes/_local'
         assert_equal 'node-1', response.body['nodes'].to_a[0][1]['name']
       end
     end
@@ -71,30 +71,30 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
         @port = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
         @client = Elasticsearch::Client.new \
                     hosts: ["localhost:#{@port}", "foobar1"],
-                    logger: @logger,
+                    logger: (ENV['QUIET'] ? nil : @logger),
                     retry_on_failure: true
       end
 
       should "retry the request with next server" do
         assert_nothing_raised do
-          5.times { @client.perform_request 'GET', '_cluster/nodes/_local' }
+          5.times { @client.perform_request 'GET', '_nodes/_local' }
         end
       end
 
       should "raise exception when it cannot get any healthy server" do
         @client = Elasticsearch::Client.new \
                   hosts: ["localhost:#{@port}", "foobar1", "foobar2", "foobar3"],
-                  logger: @logger,
+                  logger: (ENV['QUIET'] ? nil : @logger),
                   retry_on_failure: 1
 
         assert_nothing_raised do
           # First hit is OK
-          @client.perform_request 'GET', '_cluster/nodes/_local'
+          @client.perform_request 'GET', '_nodes/_local'
         end
 
         assert_raise Faraday::Error::ConnectionFailed do
           # Second hit fails
-          @client.perform_request 'GET', '_cluster/nodes/_local'
+          @client.perform_request 'GET', '_nodes/_local'
         end
       end
     end
@@ -103,14 +103,14 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       setup do
         @client = Elasticsearch::Client.new \
                   hosts: ["localhost:#{@port}", "foobar1", "foobar2"],
-                  logger: @logger,
+                  logger: (ENV['QUIET'] ? nil : @logger),
                   reload_on_failure: true
       end
 
       should "reload the connections" do
         assert_equal 3, @client.transport.connections.size
         assert_nothing_raised do
-          5.times { @client.perform_request 'GET', '_cluster/nodes/_local' }
+          5.times { @client.perform_request 'GET', '_nodes/_local' }
         end
         assert_equal 2, @client.transport.connections.size
       end

data/test/integration/transport_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::IntegrationTestCase
   startup do
-    Elasticsearch::Extensions::Test::Cluster.start if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
+    Elasticsearch::Extensions::Test::Cluster.start(nodes: 2) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
   end
 
   context "Transport" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json