thrift_client 0.9.0 → 0.9.1

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,72 +1,81 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: thrift_client
-version: !ruby/object:Gem::Version
-  version: 0.9.0
+version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 1
+  version: 0.9.1
 platform: ruby
-authors:
+authors: 
 - Evan Weaver
 - Ryan King
 - Jeff Hodges
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thrift
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongrel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0.pre2
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mongrel
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 2029539953
+        segments: 
+        - 1
+        - 2
+        - 0
+        - pre
+        - 2
         version: 1.2.0.pre2
+  type: :development
+  version_requirements: *id003
 description: 
 email: 
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/thrift_client/abstract_thrift_client.rb
 - lib/thrift_client/connection/base.rb
 - lib/thrift_client/connection/factory.rb
@@ -87,29 +96,38 @@ files:
 - test/thrift_client_test.rb
 homepage: https://github.com/twitter/thrift_client
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.
-test_files:
+test_files: 
 - test/greeter/greeter.rb
 - test/greeter/server.rb
 - test/multiple_working_servers_test.rb