disque 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 567ba45ec3c94e38a4cdd18cc6a58db6960cb6cf
-  data.tar.gz: f6e258e52e77636493ada87f131ce8495ef97c85
+  metadata.gz: 56a16e44f931c9df3d8034e20f33ac0aea958236
+  data.tar.gz: 228513e14dd5e84c7bb75b3a11fae24b11ef0d79
 SHA512:
-  metadata.gz: 4f933756f0b4165e327f8ce4ea93315d527806bfb9b6a20a5af0c3d2dad25eb219fb06c610410a561f88446ba1c12bbac292126369c9e924ec2c8fde614e0caa
-  data.tar.gz: 8f3ad9b91c3d16703fa1d77ae1d64be07108ed59bcf3225c1782d16a773413abcd5eb63c39a1ba4dae6973eab67140443b40952b71528323438b71070060fe8e
+  metadata.gz: abee6e5004f76d9a8dea568af92c3875a515ff409e96e122a4cfa49435cf08f5b5f3e1d087c7d9f72d94d47a571c6216ba6e79b7ba9f56ac48e45576a5295c22
+  data.tar.gz: 64960b88004ac406d5ef67bf7ca9776892e3fe7ef95c72372d6e8ae58922f2e7c4303c899038251d534edcca871dc4fccbbefe9564af131f2cb316a61e7b6215

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.0.6
+
+- Limit exploration to initial node list
+
 0.0.5
 
 - Change API to receive a string of nodes

data/disque.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = "disque"
-  s.version           = "0.0.5"
+  s.version           = "0.0.6"
   s.summary           = "Client for Disque"
   s.description       = "Disque client for Ruby"
   s.authors           = ["Michel Martens", "Damian Janowski"]

data/lib/disque.rb

@@ -42,6 +42,8 @@ class Disque
     # Operations counter
     @count = 0
 
+    @hosts = hosts
+
     # Known nodes
     @nodes = Hash.new
 
@@ -57,7 +59,7 @@ class Disque
     # Preferred client prefix
     @prefix = nil
 
-    explore!(hosts)
+    explore!
   end
 
   def url(host)
@@ -70,12 +72,12 @@ class Disque
 
   # Collect the list of nodes and keep a connection to the
   # node that provided that information.
-  def explore!(hosts)
+  def explore!
 
     # Reset nodes
     @nodes.clear
 
-    hosts.each do |host|
+    @hosts.each do |host|
       begin
         @scout.configure(url(host))
 
@@ -87,18 +89,14 @@ class Disque
         # our stats are based on that.
         @prefix = result[1][0,8]
 
-        # Connect the main client to the first node that replied
-        @client.configure(@scout.url)
+        # Populate cache
+        @nodes[@prefix] = host
 
-        # Populate cache with the list of node and their hosts
-        result[2..-1].each do |node_id, hostname, port, priority|
-          @nodes[node_id[0,8]] = sprintf("%s:%s", hostname, port)
-        end
+        # Connect the main client to the last scouted node
+        @client.configure(@scout.url)
 
         @scout.quit
 
-        break
-
       rescue *ECONN
         $stderr.puts($!.inspect)
       end
@@ -138,7 +136,7 @@ class Disque
   def call(*args)
     @client.call!(*args)
   rescue *ECONN
-    explore!(@nodes.values)
+    explore!
     retry
   end
 

data/tests/disque_test.rb

@@ -124,7 +124,7 @@ test "add jobs with other parameters" do
 end
 
 test "connect to the best node" do
-  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2, auth: "test")
+  c1 = Disque.new([DISQUE_GOOD_NODES[1], DISQUE_GOOD_NODES[0]], cycle: 2, auth: "test")
   c2 = Disque.new([DISQUE_GOOD_NODES[1]], cycle: 2, auth: "test")
 
   assert c1.prefix != c2.prefix
@@ -146,8 +146,8 @@ test "connect to the best node" do
 end
 
 test "connect to the best node, part 2" do
-  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2, auth: "test")
-  c2 = Disque.new([DISQUE_GOOD_NODES[1]], cycle: 2, auth: "test")
+  c1 = Disque.new([DISQUE_GOOD_NODES[1], DISQUE_GOOD_NODES[0]], cycle: 2, auth: "test")
+  c2 = Disque.new([DISQUE_GOOD_NODES[0], DISQUE_GOOD_NODES[1]], cycle: 2, auth: "test")
 
   assert c1.prefix != c2.prefix
 
@@ -164,7 +164,11 @@ test "connect to the best node, part 2" do
 end
 
 test "recover after node disconnection" do
-  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2, auth: "test")
+  Silencer.start
+
+  c1 = Disque.new([DISQUE_GOOD_NODES[0], DISQUE_BAD_NODES[0]], cycle: 2, auth: "test")
+
+  Silencer.stop
 
   prefix = c1.prefix
 
@@ -178,6 +182,8 @@ test "recover after node disconnection" do
     key != "fake"
   end
 
+  Silencer.start
+
   c1.push("q1", "j1", 1000)
   c1.push("q1", "j2", 1000)
   c1.push("q1", "j3", 1000)
@@ -186,8 +192,11 @@ test "recover after node disconnection" do
   c1.fetch(from: ["q1"])
   c1.fetch(from: ["q1"])
 
+  Silencer.stop
+
   # Prefix should stay the same
   assert_equal prefix, c1.prefix
+  assert_equal "#<Errno::ECONNREFUSED: Can't connect to: disque://:test@127.0.0.1:7710>\n", Silencer.output
 end
 
 test "federation" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disque
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Michel Martens
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic