thrift_client 0.3.2 → 0.3.3

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.3.3  Allow for a timeout over all requests in a call.
 
 v0.3.2. Fix connection close bug (nkallen, mattknox).
 

data/lib/thrift_client.rb

@@ -8,12 +8,13 @@ else
   require 'thrift'
 end
 
+require 'timeout'
 require 'rubygems'
 require 'thrift_client/thrift'
 
 class ThriftClient
-
   class NoServersAvailable < StandardError; end
+  class GlobalThriftClientTimeout < Timeout::Error; end
 
   DEFAULTS = {
     :protocol => Thrift::BinaryProtocol,
@@ -51,7 +52,8 @@ Valid optional parameters are:
 <tt>:retries</tt>:: How many times to retry a request. Defaults to the number of servers defined.
 <tt>:server_retry_period</tt>:: How many seconds to wait before trying to reconnect after marking all servers as down. Defaults to <tt>1</tt>. Set to <tt>nil</tt> to retry endlessly.
 <tt>:server_max_requests</tt>:: How many requests to perform before moving on to the next server in the pool, regardless of error status. Defaults to <tt>nil</tt> (no limit).
-<tt>:timeout</tt>:: Specify the default timeout in seconds. Defaults to <tt>1</tt>.
+<tt>:global_timeout</tt>:: Specify the timeout for all connections made. Defaults to being disabled.
+<tt>:timeout</tt>:: Specify the default timeout in seconds per connection. Defaults to <tt>1</tt>.
 <tt>:timeout_overrides</tt>:: Specify additional timeouts on a per-method basis, in seconds. Only works with <tt>Thrift::BufferedTransport</tt>.
 <tt>:defaults</tt>:: Specify default values to return on a per-method basis, if <tt>:raise</tt> is set to false.
 
@@ -74,6 +76,7 @@ Valid optional parameters are:
     @request_count = 0
     @max_requests = @options[:server_max_requests]
     @retry_period = @options[:server_retry_period]
+    @global_timeout = @options[:global_timeout] || 0
     rebuild_live_server_list!
 
     @client_class.instance_methods.each do |method_name|
@@ -117,6 +120,15 @@ Valid optional parameters are:
   private
 
   def proxy(method_name, *args)
+    Timeout.timeout(@global_timeout, GlobalThriftClientTimeout) do
+      raw_proxy(method_name, *args)
+    end
+  rescue GlobalThriftClientTimeout => e
+    disconnect!(false)
+    raise e
+  end
+
+  def raw_proxy(method_name, *args)
     disconnect! if @max_requests and @request_count >= @max_requests
     connect! unless @client
 

data/thrift_client.gemspec

@@ -2,12 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2009-12-10}
+  s.date = %q{2010-01-11}
   s.description = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
   s.email = %q{}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/thrift_client.rb", "lib/thrift_client/thrift.rb"]
@@ -17,7 +16,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
   s.rubygems_version = %q{1.3.5}
-  s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
   s.test_files = ["test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_test.rb"]
 

metadata

@@ -1,36 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Evan Weaver
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARldmFu
-  MRgwFgYKCZImiZPyLGQBGRYIY2xvdWRidXIxEjAQBgoJkiaJk/IsZAEZFgJzdDAe
-  Fw0wNzA5MTYxMDMzMDBaFw0wODA5MTUxMDMzMDBaMD0xDTALBgNVBAMMBGV2YW4x
-  GDAWBgoJkiaJk/IsZAEZFghjbG91ZGJ1cjESMBAGCgmSJomT8ixkARkWAnN0MIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5C0Io89nyApnr+PvbNFge9Vs
-  yRWAlGBUEMahpXp28VrrfXZT0rAW7JBo4PlCE3jl4nE4dzE6gAdItSycjTosrw7A
-  Ir5+xoyl4Vb35adv56TIQQXvNz+BzlqnkAY5JN0CSBRTQb6mxS3hFyD/h4qgDosj
-  R2RFVzHqSxCS8xq4Ny8uzOwOi+Xyu4w67fI5JvnPvMxqrlR1eaIQHmxnf76RzC46
-  QO5QhufjAYGGXd960XzbQsQyTDUYJzrvT7AdOfiyZzKQykKt8dEpDn+QPjFTnGnT
-  QmgJBX5WJN0lHF2l1sbv3gh4Kn1tZu+kTUqeXY6ShAoDTyvZRiFqQdwh8w2lTQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU+WqJz3xQ
-  XSea1hRvvHWcIMgeeC4wDQYJKoZIhvcNAQEFBQADggEBAGLZ75jfOEW8Nsl26CTt
-  JFrWxQTcQT/UljeefVE3xYr7lc9oQjbqO3FOyued3qW7TaNEtZfSHoYeUSMYbpw1
-  XAwocIPuSRFDGM4B+hgQGVDx8PMGiJKom4qLXjO40UZsR7QyN/u869Vj45LURm6h
-  MBcPeqCASI+WNprj9+uZa2kmHiitrFqqfMBNlm5IFbn9XeYSta9AHVvs5QQqV2m5
-  hIPfLqCyxsn/YgOGvo6iwyQTWyTswamaAC3HRWZxIS1sfn/Ssqa7E7oQMkv5FAXr
-  x5rKePfXINf8XTJczkl9OBEYdE9aNdJsJpXD0asLgGVwBICS5Bjohp6mizJcDC1+
-  yZ0=
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2009-12-10 00:00:00 -08:00
+date: 2010-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

data.tar.gz.sig

@@ -1,2 +0,0 @@
-�2���G�����(�QrJw�n�^�48%�NnY�2�vL�X}4b<��n�6UD3�q̜�ퟆg�g3�V��r-�XF�x�zb?�Ŭy�G:�[AnauFK�� �j�Q�I_����b��LZ�8����׍q��ꃁl���۠$���O�BT���M��?�kV���q�(�w�eL��-�y[��.&�
-��؀ᠠ�=�~���ǘ���߉rκ])�wgzl;0b�e��?�2��7DF��s|�

metadata.gz.sig

@@ -1,2 +0,0 @@
-I4�:0�����8���)���O����G�\���[b���[����K۾�Y�� 8�y�p�ñ�{7<|����+9[������L�#K6ɷ�G�����jԄ�Ei��o���4{���e����q��v��-�>v�e�ё�x��׏�ʍWʞ/��Z������pp�o�I��{�T�ұ6���'��w��
-�����[��