thrift_client 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+
+v0.2.2. Fix connect bug.
+
 v0.2.1. Don't turn off strict_read by default; allow override.
 
 v0.2. Add ThriftClient::Simple (Robey).

data/lib/thrift_client/thrift.rb

@@ -4,17 +4,17 @@ module Thrift
     def timeout=(timeout)
       @transport.timeout = timeout
     end
-  
+
     def timeout
       @transport.timeout
     end
   end
-  
+
   module Client
     def timeout=(timeout)
       @iprot.trans.timeout = timeout
     end
-  
+
     def timeout
       @iprot.trans.timeout
     end

data/lib/thrift_client.rb

@@ -1,6 +1,14 @@
 
+if ENV["ANCIENT_THRIFT"]
+  $LOAD_PATH.unshift("/Users/eweaver/p/twitter/rails/vendor/gems/thrift-751142/lib")
+  $LOAD_PATH.unshift("/Users/eweaver/p/twitter/rails/vendor/gems/thrift-751142/ext")
+  require 'thrift'
+else
+  require 'rubygems'
+  require 'thrift'
+end
+
 require 'rubygems'
-require 'thrift'
 require 'thrift_client/thrift'
 
 class ThriftClient
@@ -21,7 +29,7 @@ class ThriftClient
       NoServersAvailable],
     :raise => true,
     :retries => nil,
-    :server_retry_period => nil,
+    :server_retry_period => 1,
     :timeouts => Hash.new(1),
     :defaults => {}
   }.freeze
@@ -39,7 +47,7 @@ Valid optional parameters are:
 <tt>:randomize_server_list</tt>:: Whether to connect to the servers randomly, instead of in order. Defaults to <tt>true</tt>.
 <tt>:raise</tt>:: Whether to reraise errors if no responsive servers are found. Defaults to <tt>true</tt>.
 <tt>:retries</tt>:: How many times to retry a request. Defaults to the number of servers defined.
-<tt>:server_retry_period</tt>:: How long to wait before trying to reconnect after marking all servers as down. Defaults to <tt>nil</tt> (do not wait).
+<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>:timeouts</tt>:: Specify timeouts on a per-method basis. Defaults to 1 second for everything. (Per-method values only work with <tt>Thrift::BufferedTransport</tt>.)
 <tt>:defaults</tt>:: Specify defaults to return on a per-method basis, if <tt>:raise</tt> is set to false.
 
@@ -54,7 +62,7 @@ Valid optional parameters are:
 
     @set_timeout = @options[:transport].instance_methods.include?("timeout=")
     @live_server_list = @server_list.dup
-    @last_retry = Time.now    
+    @last_retry = Time.now
 
     @client_class.instance_methods.each do |method_name|
       if method_name =~ /^recv_(.*)$/
@@ -72,6 +80,8 @@ Valid optional parameters are:
       Thrift::Socket.new(server.first, server.last.to_i, @options[:timeouts].default))
     @transport.open
     @client = @client_class.new(@options[:protocol].new(@transport, *@options[:protocol_extra_params]))
+  rescue Thrift::TransportException
+    retry
   end
 
   # Force the client to disconnect from the server.
@@ -86,21 +96,22 @@ Valid optional parameters are:
     connect! unless @client
     set_timeout!(method_name) if @set_timeout
     @client.send(method_name, *args)
+  rescue NoServersAvailable => e
+    handle_exception(e, method_name, args)
   rescue *@options[:exception_classes] => e
-    tries ||= @retries
-    tries -= 1
-    if tries.zero? or e.is_a?(NoServersAvailable)
+    tries ||= @retries    
+    if (tries -= 1) == 0
       handle_exception(e, method_name, args)
     else
       disconnect!
       retry
     end
   end
-  
+
   def set_timeout!(method_name)
     @client.timeout = @options[:timeouts][:method_name.to_sym]
   end
-  
+
   def handle_exception(e, method_name, args)
     raise e if @options[:raise]
     @options[:defaults][method_name.to_sym]
@@ -115,5 +126,5 @@ Valid optional parameters are:
       @live_server_list = @server_list.dup
     end
     @live_server_list.pop
-  end  
+  end
 end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 
 require 'test/unit'
+require 'benchmark'
 $LOAD_PATH << "#{File.expand_path(File.dirname(__FILE__))}/../lib"
 require 'thrift_client'
 require 'thrift_client/simple'

data/test/thrift_client_test.rb

@@ -4,6 +4,8 @@ class ThriftClientTest < Test::Unit::TestCase
   def setup
     @entry = [ScribeThrift::LogEntry.new(:message => "something", :category => "thrift_client")]
     @servers = ["127.0.0.1:1461", "127.0.0.1:1462", "127.0.0.1:1463"]
+    @socket = 1461
+    @timeout = 0.2
     @options = {:protocol_extra_params => [false]}
   end
 
@@ -15,7 +17,7 @@ class ThriftClientTest < Test::Unit::TestCase
 
   def test_non_random_fall_through
     assert_nothing_raised do
-      ThriftClient.new(ScribeThrift::Client, @servers, @options).Log(@entry)
+      ThriftClient.new(ScribeThrift::Client, @servers, @options.merge(:randomize_server_list => false)).Log(@entry)
     end
   end
 
@@ -54,16 +56,51 @@ class ThriftClientTest < Test::Unit::TestCase
   end
 
   def test_no_servers_eventually_raise
-    assert_raises(Thrift::TransportException) do
-      ThriftClient.new(ScribeThrift::Client, @servers[0,2], @options).Log(@entry)
+    client = ThriftClient.new(ScribeThrift::Client, @servers[0,2], @options)
+    assert_raises(ThriftClient::NoServersAvailable) do
+      client.Log(@entry)
+      client.disconnect!
     end
   end
+  
+  def test_framed_transport_timeout
+    socket = stub_server(@socket)
+    measurement = Benchmark.measure do
+      assert_raises(Thrift::TransportException) do
+        ThriftClient.new(ScribeThrift::Client, "127.0.0.1:#{@socket}", 
+          @options.merge(:timeouts => Hash.new(@timeout))
+        ).Log(@entry) 
+      end
+    end
+    assert((measurement.real < @timeout + 0.01), "#{measurement.real} > #{@timeout}")
+    socket.close
+  end
+
+  def test_buffered_transport_timeout
+    socket = stub_server(@socket)
+    measurement = Benchmark.measure do
+      assert_raises(Thrift::TransportException) do
+        ThriftClient.new(ScribeThrift::Client, "127.0.0.1:#{@socket}",
+          @options.merge(:timeouts => Hash.new(@timeout), :transport => Thrift::BufferedTransport)
+        ).Log(@entry) 
+      end
+    end
+    assert((measurement.real < @timeout + 0.01), "#{measurement.real} > #{@timeout}")
+    socket.close
+  end
 
   def test_retry_period
     client = ThriftClient.new(ScribeThrift::Client, @servers[0,2], @options.merge(:server_retry_period => 1))
-    assert_raises(Thrift::TransportException) { client.Log(@entry) }
     assert_raises(ThriftClient::NoServersAvailable) { client.Log(@entry) }
-    sleep 1
-    assert_raises(Thrift::TransportException) { client.Log(@entry) }
+    sleep 1.1
+    assert_raises(ThriftClient::NoServersAvailable) { client.Log(@entry) }
   end
+  
+  private
+  
+  def stub_server(port)
+    socket = TCPServer.new('127.0.0.1', port)
+    Thread.new { socket.accept }
+    socket
+  end  
 end

data/thrift_client.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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-10-28}
+  s.date = %q{2009-11-18}
   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"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Thrift_client", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.4}
+  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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-10-28 00:00:00 -07:00
+date: 2009-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.

metadata.gz.sig

@@ -1,3 +1,4 @@
-�Q1He�����H
�)����8�2'X+0'�?�1(O/�0�˪v������9G�0u%����
-�����d�U��bǷ��=��
-^đ��
+�4�E�
�X����h.B�Z����J�q-�'����O6�O�X�̞�Mk)/6�–��eg���+�v�
+?&/��)��
+ �ԪG�������=�h��FO��sD���8���ۮ�I� �S/w�
+w�/;Z��H��Tt��PS�J�����F!R\�rhJ�V��~���f�z�2S��.�a�T��1��^�˩~�T�ؿ