thrift_client 0.4.2 → 0.4.3

data/CHANGELOG

@@ -1,9 +1,11 @@
+v0.4.3 Bug fixes: handle_exception could be called more than once. Integer types are read signed.
+
 v0.4.2 Allow per-method overrides of retries. Fix several bugs with EventMachine.
 
 v0.4.1 Making ThriftClient decoratable. Able to add new functionality a class definition.
 
 v0.4.0. Add new EventMachine transport.  This requires two layers of transport
-configurability: 
+configurability:
   options[:transport] for EventMachine or Socket transports
   options[:transport_wrapper] for optional Buffered or Framed Transport.
 Clients will need to update their options to ensure they don't conflict with this change. (mperham)

data/lib/thrift_client.rb

@@ -26,7 +26,8 @@ Valid optional parameters are:
 
 <tt>:protocol</tt>:: Which Thrift protocol to use. Defaults to <tt>Thrift::BinaryProtocol</tt>.
 <tt>:protocol_extra_params</tt>:: An array of additional parameters to pass to the protocol initialization call. Defaults to <tt>[]</tt>.
-<tt>:transport</tt>:: Which Thrift transport to use. Defaults to <tt>Thrift::FramedTransport</tt>.
+<tt>:transport</tt>:: Which Thrift transport to use. Defaults to <tt>Thrift::Socket</tt>.
+<tt>:transport_wrapper</tt>:: Which Thrift transport wrapper to use. Defaults to <tt>Thrift::FramedTransport</tt>.
 <tt>:randomize_server_list</tt>:: Whether to connect to the servers randomly, instead of in order. Defaults to <tt>true</tt>.
 <tt>:exception_classes</tt>:: Which exceptions to catch and retry when sending a request. Defaults to <tt>[IOError, Thrift::Exception, Thrift::ProtocolException, Thrift::ApplicationException, Thrift::TransportException, NoServersAvailable]</tt>
 <tt>:raise</tt>:: Whether to reraise errors if no responsive servers are found. Defaults to <tt>true</tt>.

data/lib/thrift_client/abstract_thrift_client.rb

@@ -153,7 +153,7 @@ class AbstractThriftClient
       disconnect_on_error!
       tries ||= (@options[:retry_overrides][method_name.to_sym] || @retries)
       tries -= 1
-      tries == 0 ? handle_exception(e, method_name, args) : retry
+      tries == 0 ? raise : retry
     end
 
     def send_rpc(method_name, *args)

data/lib/thrift_client/event_machine.rb

@@ -26,6 +26,10 @@ module Thrift
         fiber.resume
       end
       Fiber.yield
+
+      # Use Thrift::TransportException so the RetryingThriftClient knows to try the next
+      # server instead of raising the error.
+      raise Thrift::TransportException, "Unable to connect to #{@host}:#{@port}" unless @connection.connected?
       @connection
     end
 
@@ -65,32 +69,30 @@ module Thrift
     def initialize(host, port=9090)
       @host, @port = host, port
       @index = 0
-      @connected = false
+      @disconnected = 'not connected'
       @buf = ''
     end
 
     def close
       trap do
-        @connected = false
+        @disconnected = 'closed'
         close_connection(true)
       end
     end
 
     def blocking_read(size)
-      raise IOError, "lost connection to #{@host}:#{@port}" unless @connected
-      trap do
-        if can_read?(size)
-          yank(size)
-        else
-          raise ArgumentError, "Unexpected state" if @size or @callback
-
-          fiber = Fiber.current
-          @size = size
-          @callback = proc { |data|
-            fiber.resume(data)
-          }
-          Fiber.yield
-        end
+      raise IOError, "lost connection to #{@host}:#{@port}: #{@disconnected}" if @disconnected
+      if can_read?(size)
+        yank(size)
+      else
+        raise ArgumentError, "Unexpected state" if @size or @callback
+
+        fiber = Fiber.current
+        @size = size
+        @callback = proc { |data|
+          fiber.resume(data)
+        }
+        Fiber.yield
       end
     end
 
@@ -108,17 +110,17 @@ module Thrift
     end
 
     def connected?
-      @connected
+      !@disconnected
     end
 
     def connection_completed
-      @connected = true
+      @disconnected = nil
       succeed
     end
 
     def unbind
-      if @connected
-        @connected = false
+      if !@disconnected
+        @disconnected = 'unbound'
       else
         fail
       end

data/lib/thrift_client/simple.rb

@@ -100,7 +100,8 @@ class ThriftClient
           s.read(len)
         when I64
           hi, lo = s.read(8).unpack("NN")
-          (hi << 32) | lo
+          rv = (hi << 32) | lo
+          (rv >= (1 << 63)) ? (rv - (1 << 64)) : rv
         when LIST
           read_list(s)
         when MAP
@@ -114,7 +115,15 @@ class ThriftClient
         when StructType
           read_struct(s, type.struct_class)
         else
-          s.read(SIZES[type]).unpack(FORMATS[type]).first
+          rv = s.read(SIZES[type]).unpack(FORMATS[type]).first
+          case type
+          when I16
+            (rv >= (1 << 15)) ? (rv - (1 << 16)) : rv
+          when I32
+            (rv >= (1 << 31)) ? (rv - (1 << 32)) : rv
+          else
+            rv
+          end
         end
       end
 

data/test/thrift_client_test.rb

@@ -44,6 +44,21 @@ class ThriftClientTest < Test::Unit::TestCase
     end
   end
 
+  def test_handle_exception_is_called_once_when_retrying
+    client = ThriftClient.new(Greeter::Client, @servers.first, @options.merge(:raise => false, :retries => 1))
+    client.options[:exception_classes] += [ThriftClient::NoServersAvailable]
+    singleton_class = (class << client; self end)
+
+    times_called = 0
+    singleton_class.send :define_method, :handle_exception do |*args|
+      times_called += 1
+      raise IOError
+    end
+
+    assert_raises(IOError) { client.greeting('someone') }
+    assert_equal 1, times_called
+  end
+
   def test_dont_raise_with_defaults
     client = ThriftClient.new(Greeter::Client, @servers.first, @options.merge(:raise => false, :defaults => {:greeting => 1}))
     assert_equal 1, client.greeting

data/thrift_client.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.4.2"
+  s.version = "0.4.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/ryan/.gemkeys/gem-public_cert.pem"]
-  s.date = %q{2010-04-08}
+  s.cert_chain = ["/Users/freels/.gemkeys/gem-public_cert.pem"]
+  s.date = %q{2010-05-10}
   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"]
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   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.5}
-  s.signing_key = %q{/Users/ryan/.gemkeys/gem-private_key.pem}
+  s.rubygems_version = %q{1.3.6}
+  s.signing_key = %q{/Users/freels/.gemkeys/gem-private_key.pem}
   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"]
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Evan Weaver
@@ -10,39 +15,41 @@ bindir: bin
 cert_chain: 
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ0wCwYDVQQDDARyeWFu
-  MRswGQYKCZImiZPyLGQBGRYLdGhlcnlhbmtpbmcxEzARBgoJkiaJk/IsZAEZFgNj
-  b20wHhcNMTAwMTA4MTc1MDM0WhcNMTEwMTA4MTc1MDM0WjBBMQ0wCwYDVQQDDARy
-  eWFuMRswGQYKCZImiZPyLGQBGRYLdGhlcnlhbmtpbmcxEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLPp+0PtRT3qCI
-  02sMsADSn7Uf1GpyXUtk4Fb94LqUO6Scl91YDmbFMpjzrQwQvBYMIVreWcwSish6
-  nip6WEk9lqXcOeDmex/qY2/FVXG8ffqjFHiNiN9vpWrWj5VMICequ+ftzWLKsPIS
-  DGJ4o+Z6wEYRuirgaRPCYAUDPglsaqctJ56wPuycryMe5+ApSkOS9iLWMprQKEAq
-  j2R2OBV0dSARdbtzuKwrP7sLDo7uPa0egFBUlcZ+nujGr4LvmpryB8scNRNmZK1w
-  1rEI7O06CbULj08qYxEhnKmFE7LbBoN/HrmvZLVQK5mWuiZQhtmJuhBfStJsaDux
-  5tBEkYZVAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBSnLarDEo5eBE2arSMrBdOOhtrnPTANBgkqhkiG9w0BAQUFAAOCAQEANER07s4K
-  Pvc1DSduliRDMUax/VSfLzDTtTAQwuSAPDrWAYXKugcJtOZOXjDbGL7c5zoWmy9u
-  Fn5vEVdm/93J+84D/IMaaof3BwX/NNEYH01CeZEIGMfc5AFFha7dabzP/uiPpb/c
-  GSvomC9IzyN37+eWwOS16cC+5XnBT6KRCaXYg2Fh6WpTgde67OVgXr4Q58HXlaZ+
-  /2BB3wq9lZ4JskvlpYpYnlPAUyiyc6R2Mjts1pURz5nkW4SuS7Kd1KCOOyr1McDH
-  VP12sTSjJclmI17BjDGQpAF0n9v5ExhJxWpeOjeBUPQsOin3ypEM1KkckLmOKvH6
-  zyKMYVRO0z/58g==
+  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARtYXR0
+  MRYwFAYKCZImiZPyLGQBGRYGZnJlZWxzMRQwEgYKCZImiZPyLGQBGRYEbmFtZTAe
+  Fw0xMDA1MTAyMjA0NTVaFw0xMTA1MTAyMjA0NTVaMD0xDTALBgNVBAMMBG1hdHQx
+  FjAUBgoJkiaJk/IsZAEZFgZmcmVlbHMxFDASBgoJkiaJk/IsZAEZFgRuYW1lMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuolq5fjVtDVlUMy690FYuonn
+  Ww1PNQrx/xP/lKHXIuw0N1r53Rs3+u331Z2lxgNTf7xpCm28TaY7MHLQJeCsCuiW
+  xRS1lDZc/D6gSbF1R8NrjX5Z2GkYhWwWq1JCqncGEMu9L2S7w3JEm1uAp9+Slf79
+  FRDf8YsxolMo9kvIE9I7E+38tpfgB7V2kl7BWWGkqX+xpF6hYZJ8rJm07PFFPMC9
+  mS2VSMShvJHLKpfu94Ud4WP9z05qX8sq+2TWkKHxp5GKndHsGDfWLgLExcw+FHK2
+  aSMVczp3gJjX9/Oz5cUDvplwUmuSgdZPG/OloA5THH9yP+uHssJHmveV5eokswID
+  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUK1mG9LJ8
+  oj7zMsGt3a72q8M7JqIwDQYJKoZIhvcNAQEFBQADggEBAHnGX2oDk+SQXrFGa/jO
+  IXmx3pl4PxriRAdUnJJNKSEopGYh/mr/Mu2XDv4eW4GgBZbqvzuPWavsVYFIQwKK
+  Sz4FylZ9fxpcY3mWsz31IwrjYkZ6U43DP/pIw6Sv0iw2xhZwJPt09jZexs2KaH6l
+  Non+q//rdf1avbcuWNBeSJIK03s7C4pS3lKfRfF/9KsuIbDFvbwNKC00uiXmokSP
+  UdFLVl8y27MG7seE2788E6WaHrLWNhN+/dReDiOA5VjrkPI2lfHRqXDnaZTjvCir
+  5Cd6/wLNizaHOQCmp6VxpCuDA67P+TzXCvR7ElyQ2ErG2IHeSAoB/57bxToe40Rz
+  1LE=
   -----END CERTIFICATE-----
 
-date: 2010-04-08 00:00:00 -07:00
+date: 2010-05-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: A Thrift client wrapper that encapsulates some common failover behavior.
 email: ""
 executables: []
@@ -106,18 +113,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      - 8
       version: "0.8"
-  version: 
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.