Heavily influenced by another sce pull request.

pat · May 11, 2012 · 40c96fd · 40c96fd · ngan · Sep 12, 2012
1 parent dfbe714
commit 40c96fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/HISTORY b/HISTORY
@@ -1,4 +1,5 @@
 Edge:
+- Use a local array of servers - don't clear the main set (S. Christoffer Eliesen).
 - Fixing VersionError reference for Sphinx 0.9.9 or better (S. Christoffer Eliesen).
 - Consistent documentation for default port: 9312 (Aleksey Morozov).
 - Sphinx 2.0.4 support (Ilia Lobsanov).

diff --git a/lib/riddle/client.rb b/lib/riddle/client.rb
@@ -495,15 +495,17 @@ def close
     def open_socket
       raise "Already Connected" unless @socket.nil?
 
+      available_servers = servers.dup
+
       if @timeout == 0
         @socket = initialise_connection
       else
         begin
           Timeout.timeout(@timeout) { @socket = initialise_connection }
         rescue Timeout::Error, Riddle::ConnectionError => e
           failed_servers ||= []
-          failed_servers << servers.shift
-          retry if !servers.empty?
+          failed_servers << available_servers.shift
+          retry if !available_servers.empty?
 
           case e
           when Timeout::Error