thrift_client 0.8.3 → 0.8.4

data/lib/thrift_client/abstract_thrift_client.rb

@@ -92,14 +92,20 @@ class AbstractThriftClient
   # Force the client to connect to the server. Not necessary to be
   # called as the connection will be made on the first RPC method
   # call.
-  def connect!
+  def connect!(method = nil)
+    start_time ||= Time.now
     @current_server = next_live_server
     @client = @current_server.client
     @last_client = @client
     do_callbacks(:post_connect, self)
   rescue IOError, Thrift::TransportException
     disconnect!(true)
-    retry
+    timeout = timeout(method)
+    if timeout && Time.now - start_time > timeout
+      no_servers_available!
+    else
+      retry
+    end
   end
 
   def disconnect!(error = false)
@@ -132,7 +138,7 @@ class AbstractThriftClient
         return @server_list[cur]
       end
     end
-    raise ThriftClient::NoServersAvailable, "No live servers in #{@server_list.inspect}."
+    no_servers_available!
   end
 
   def ensure_socket_alignment
@@ -150,9 +156,9 @@ class AbstractThriftClient
 
   def handled_proxy(method_name, *args)
     begin
-      connect! unless @client
+      connect!(method_name.to_sym) unless @client
       if has_timeouts?
-        @client.timeout = @options[:timeout_overrides][method_name.to_sym] || @options[:timeout]
+        @client.timeout = timeout(method_name.to_sym)
       end
       @request_count += 1
       do_callbacks(:before_method, method_name)
@@ -196,6 +202,10 @@ class AbstractThriftClient
     @has_timeouts ||= @options[:timeout_overrides].any? && transport_can_timeout?
   end
 
+  def timeout(method = nil)
+    @options[:timeout_overrides][method] || @options[:timeout]
+  end
+
   def transport_can_timeout?
     if (@options[:transport_wrapper] || @options[:transport]).method_defined?(:timeout=)
       true
@@ -204,4 +214,8 @@ class AbstractThriftClient
       false
     end
   end
+
+  def no_servers_available!
+    raise ThriftClient::NoServersAvailable, "No live servers in #{@server_list.inspect}."
+  end
 end

data/test/thrift_client_test.rb

@@ -230,6 +230,11 @@ class ThriftClientTest < Test::Unit::TestCase
     assert_raises(ThriftClient::NoServersAvailable) { client.greeting("someone") }
   end
 
+  def test_connect_retry_period
+    client = ThriftClient.new(Greeter::Client, @servers[0], @options.merge(:server_retry_period => 0))
+    assert_raises(ThriftClient::NoServersAvailable) { client.connect! }
+  end
+
   def test_client_with_retry_period_drops_servers
     client = ThriftClient.new(Greeter::Client, @servers[0,2], @options.merge(:server_retry_period => 1, :retries => 2))
     assert_raises(ThriftClient::NoServersAvailable) { client.greeting("someone") }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Evan Weaver
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-26 00:00:00 Z
+date: 2013-02-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift
@@ -36,14 +36,28 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mongrel
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -3814261918
+        hash: 2328195415
         segments: 
         - 1
         - 2
@@ -52,7 +66,7 @@ dependencies:
         - 2
         version: 1.2.0.pre2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: 
 email: 
 executables: []
@@ -109,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.