thrift_client 0.6.0 → 0.6.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.1 Add connect timeout. Bump thrift dependency to ~> v0.6.0.
+
 v0.6.0 Fix bug where we'd try to mark the current server down when we didn't have a current server.
 Upgrade to thrift 0.5.
 

data/Rakefile

@@ -7,10 +7,8 @@ Echoe.new("thrift_client") do |p|
   p.project = "fauna"
   p.summary = "A Thrift client wrapper that encapsulates some common failover behavior."
   p.rubygems_version = ">= 0.8"
-  p.dependencies = ['thrift ~>0.5.0']
+  p.dependencies = ['thrift ~>0.6.0']
   p.ignore_pattern = /^(vendor\/thrift)/
   p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
-  p.url = "http://blog.evanweaver.com/files/doc/fauna/thrift_client/"
-  p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
   p.spec_pattern = "spec/*_spec.rb"
 end

data/lib/thrift_client/abstract_thrift_client.rb

@@ -38,6 +38,7 @@ class AbstractThriftClient
     :server_max_requests => nil,
     :retry_overrides => {},
     :wrapped_exception_classes => DEFAULT_WRAPPED_ERRORS,
+    :connect_timeout => 0.1,
     :timeout => 1,
     :timeout_overrides => {}
   }
@@ -78,7 +79,7 @@ class AbstractThriftClient
   # call.
   def connect!
     @current_server = next_live_server
-    @connection = Connection::Factory.create(@options[:transport], @options[:transport_wrapper], @current_server.connection_string, @options[:timeout])
+    @connection = Connection::Factory.create(@options[:transport], @options[:transport_wrapper], @current_server.connection_string, @options[:connect_timeout])
     @connection.connect!
     @client = @client_class.new(@options[:protocol].new(@connection.transport, *@options[:protocol_extra_params]))
   end

data/test/thrift_client_test.rb

@@ -91,12 +91,25 @@ class ThriftClientTest < Test::Unit::TestCase
     end
   end
 
+  def test_socket_timeout
+    stub_server(@port) do |socket|
+      measurement = Benchmark.measure do
+        assert_raises(Greeter::Client::TransportException) do
+          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@port}",
+            @options.merge(:timeout => 1, :connect_timeout => 0.5)
+            ).greeting("someone")
+        end
+      end
+      assert(measurement.real > 0.5 && measurement.real < 1)
+    end
+  end
+
   def test_framed_transport_timeout
     stub_server(@port) do |socket|
       measurement = Benchmark.measure do
         assert_raises(Greeter::Client::TransportException) do
           ThriftClient.new(Greeter::Client, "127.0.0.1:#{@port}",
-            @options.merge(:timeout => @timeout)
+            @options.merge(:timeout => @timeout, :connect_timeout => @timeout)
           ).greeting("someone")
         end
       end
@@ -108,7 +121,7 @@ class ThriftClientTest < Test::Unit::TestCase
     stub_server(@port) do |socket|
       measurement = Benchmark.measure do
         client = ThriftClient.new(Greeter::Client, "127.0.0.1:#{@port}",
-          @options.merge(:timeout => @timeout, :transport_wrapper => Thrift::BufferedTransport)
+          @options.merge(:timeout => @timeout, :transport_wrapper => Thrift::BufferedTransport, :connect_timeout => @timeout)
         )
         assert_raises(Greeter::Client::TransportException) do
           client.greeting("someone")

data/thrift_client.gemspec

@@ -2,33 +2,32 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver, Ryan King, Jeff Hodges"]
-  s.date = %q{2010-12-08}
+  s.date = %q{2011-05-09}
   s.description = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
   s.email = %q{}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "lib/thrift_client.rb", "lib/thrift_client/abstract_thrift_client.rb", "lib/thrift_client/connection.rb", "lib/thrift_client/connection/base.rb", "lib/thrift_client/connection/factory.rb", "lib/thrift_client/connection/http.rb", "lib/thrift_client/connection/socket.rb", "lib/thrift_client/event_machine.rb", "lib/thrift_client/simple.rb", "lib/thrift_client/thrift.rb"]
   s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "lib/thrift_client.rb", "lib/thrift_client/abstract_thrift_client.rb", "lib/thrift_client/connection.rb", "lib/thrift_client/connection/base.rb", "lib/thrift_client/connection/factory.rb", "lib/thrift_client/connection/http.rb", "lib/thrift_client/connection/socket.rb", "lib/thrift_client/event_machine.rb", "lib/thrift_client/simple.rb", "lib/thrift_client/thrift.rb", "test/greeter/greeter.rb", "test/greeter/greeter.thrift", "test/greeter/server.rb", "test/multiple_working_servers_test.rb", "test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_http_test.rb", "test/thrift_client_test.rb", "thrift_client.gemspec"]
-  s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/thrift_client/}
+  s.homepage = %q{http://fauna.github.com/fauna/thrift_client/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Thrift_client", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
   s.test_files = ["test/multiple_working_servers_test.rb", "test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_http_test.rb", "test/thrift_client_test.rb"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<thrift>, ["~> 0.6.0"])
     else
-      s.add_dependency(%q<thrift>, ["~> 0.5.0"])
+      s.add_dependency(%q<thrift>, ["~> 0.6.0"])
     end
   else
-    s.add_dependency(%q<thrift>, ["~> 0.5.0"])
+    s.add_dependency(%q<thrift>, ["~> 0.6.0"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King, Jeff Hodges
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -08:00
-default_executable: 
+date: 2011-05-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 0
-        - 5
+        - 6
         - 0
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id001
 description: A Thrift client wrapper that encapsulates some common failover behavior.
@@ -79,8 +78,7 @@ files:
 - test/thrift_client_http_test.rb
 - test/thrift_client_test.rb
 - thrift_client.gemspec
-has_rdoc: true
-homepage: http://blog.evanweaver.com/files/doc/fauna/thrift_client/
+homepage: http://fauna.github.com/fauna/thrift_client/
 licenses: []
 
 post_install_message: 
@@ -115,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.