resilient_socket 0.3.2 → 0.4.0

data/lib/resilient_socket/tcp_client.rb

@@ -127,6 +127,7 @@ module ResilientSocket
     #
     #   :connect_timeout [Float]
     #     Time in seconds to timeout when trying to connect to the server
+    #     A value of -1 will cause the connect wait time to be infinite
     #     Default: Half of the :read_timeout ( 30 seconds )
     #
     #   :log_level [Symbol]
@@ -548,17 +549,22 @@ module ResilientSocket
         begin
           @socket = Socket.new(Socket.const_get(address[0][0]), Socket::SOCK_STREAM, 0)
           @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) unless buffered
-          begin
-            @socket.connect_nonblock(socket_address)
-          rescue Errno::EINPROGRESS
-          end
-          if IO.select(nil, [@socket], nil, @connect_timeout)
+          if @connect_timeout == -1
+            # Timeout of -1 means wait forever for a connection
+            @socket.connect(socket_address)
+          else
             begin
               @socket.connect_nonblock(socket_address)
-            rescue Errno::EISCONN
+            rescue Errno::EINPROGRESS
+            end
+            if IO.select(nil, [@socket], nil, @connect_timeout)
+              begin
+                @socket.connect_nonblock(socket_address)
+              rescue Errno::EISCONN
+              end
+            else
+              raise(ConnectionTimeout.new("Timedout after #{@connect_timeout} seconds trying to connect to #{server}"))
             end
-          else
-            raise(ConnectionTimeout.new("Timedout after #{@connect_timeout} seconds trying to connect to #{server}"))
           end
           break
         rescue SystemCallError => exception

data/lib/resilient_socket/version.rb

@@ -1,3 +1,3 @@
 module ResilientSocket #:nodoc
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/test/tcp_client_test.rb

@@ -75,6 +75,18 @@ class TCPClientTest < Test::Unit::TestCase
           assert_equal 'sleep', reply['result']
           @client.close
         end
+
+        should "support infinite timeout" do
+          @client = ResilientSocket::TCPClient.new(
+            :server          => @server_name,
+            :connect_timeout => -1
+          )
+          request = { 'action' => 'test1' }
+          @client.write(BSON.serialize(request))
+          reply = read_bson_document(@client)
+          assert_equal 'test1', reply['result']
+          @client.close
+        end
       end
 
       context "with client connection" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resilient_socket
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_logger