thrift_client 0.8.4 → 0.9.0

data/lib/thrift_client/abstract_thrift_client.rb

@@ -92,20 +92,14 @@ 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!(method = nil)
-    start_time ||= Time.now
+  def connect!
     @current_server = next_live_server
     @client = @current_server.client
     @last_client = @client
     do_callbacks(:post_connect, self)
   rescue IOError, Thrift::TransportException
     disconnect!(true)
-    timeout = timeout(method)
-    if timeout && Time.now - start_time > timeout
-      no_servers_available!
-    else
-      retry
-    end
+    retry
   end
 
   def disconnect!(error = false)
@@ -138,7 +132,7 @@ class AbstractThriftClient
         return @server_list[cur]
       end
     end
-    no_servers_available!
+    raise ThriftClient::NoServersAvailable, "No live servers in #{@server_list.inspect}."
   end
 
   def ensure_socket_alignment
@@ -156,9 +150,9 @@ class AbstractThriftClient
 
   def handled_proxy(method_name, *args)
     begin
-      connect!(method_name.to_sym) unless @client
+      connect! unless @client
       if has_timeouts?
-        @client.timeout = timeout(method_name.to_sym)
+        @client.timeout = @options[:timeout_overrides][method_name.to_sym] || @options[:timeout]
       end
       @request_count += 1
       do_callbacks(:before_method, method_name)
@@ -202,10 +196,6 @@ 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
@@ -214,8 +204,4 @@ 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,11 +230,6 @@ 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,81 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: thrift_client
-version: !ruby/object:Gem::Version 
-  hash: 55
+version: !ruby/object:Gem::Version
+  version: 0.9.0
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 4
-  version: 0.8.4
 platform: ruby
-authors: 
+authors:
 - Evan Weaver
 - Ryan King
 - Jeff Hodges
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thrift
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
-        version: 0.8.0
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mongrel
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 2328195415
-        segments: 
-        - 1
-        - 2
-        - 0
-        - pre
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongrel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.2.0.pre2
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0.pre2
 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
@@ -96,38 +87,29 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 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