Merge branch 'reconnect-attempts'

Resolves #347

Author: yaauie

lib/redis/client.rb

@@ -17,6 +17,7 @@ class Client
       :driver => nil,
       :id => nil,
       :tcp_keepalive => 0,
+      :reconnect_attempts => 1,
       :inherit_socket => false
     }
 
@@ -309,7 +310,7 @@ def establish_connection
     end
 
     def ensure_connected
-      tries = 0
+      attempts = 0
 
       begin
         tries += 1
@@ -325,11 +326,16 @@ def ensure_connected
           connect
         end
 
+<<<<<<< HEAD
+=======
+        attempts += 1
+
+>>>>>>> make number of retries in ensure_connected configurable
         yield
       rescue ConnectionError, InheritedError
         disconnect
 
-        if tries < 2 && @reconnect
+        if attempts <= @options[:reconnect_attempts] && @reconnect
           retry
         else
           raise

test/internals_test.rb

@@ -157,7 +157,7 @@ def test_connection_timeout
     end
   end
 
-  def close_on_ping(seq)
+  def close_on_ping(seq, options = {})
     $request = 0
 
     command = lambda do
@@ -169,7 +169,7 @@ def close_on_ping(seq)
       rv
     end
 
-    redis_mock(:ping => command, :timeout => 0.1) do |redis|
+    redis_mock({:ping => command}, {:timeout => 0.1}.merge(options)) do |redis|
       yield(redis)
     end
   end
@@ -218,6 +218,22 @@ def test_retry_only_once_when_read_raises_econnreset
     end
   end
 
+  def test_retry_with_custom_reconnect_attempts
+    close_on_ping([0, 1], :reconnect_attempts => 2) do |redis|
+      assert_equal "2", redis.ping
+    end
+  end
+
+  def test_retry_with_custom_reconnect_attempts_can_still_fail
+    close_on_ping([0, 1, 2], :reconnect_attempts => 2) do |redis|
+      assert_raise Redis::ConnectionError do
+        redis.ping
+      end
+
+      assert !redis.client.connected?
+    end
+  end
+
   def test_don_t_retry_when_second_read_in_pipeline_raises_econnreset
     close_on_ping([1]) do |redis|
       assert_raise Redis::ConnectionError do