fastbeans 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 253535af0467722585d09f5e68012b7d7cf376d4
-  data.tar.gz: 9482dc05865476f6b32629a26ccadc9ada5365c8
+  metadata.gz: 5936875dd05eed4d051e79ade5a96ff780098367
+  data.tar.gz: 393572d7da151951bdf6d454094e3b52f0dfb149
 !binary "U0hBNTEy":
-  metadata.gz: d0cad8311ce4a55d7c198a5b2443777fd362bffb77df3819731ac6b2e694967af67c542684df871f519732014a0f17e645ed715d01accc07d55e75f81436fa71
-  data.tar.gz: d390aa9d9117303fac53508e8716bd193cf1831b756767707d2dc7ae9db7f1ae58a393442143fbe37ba902e0639711ce28557bbfc5f56311b80637ad68e4754f
+  metadata.gz: 12a76b54d34d4279983c12be6d6b4ac507c0925b6de12a9d840ab32713d1db5714afbd5173a1f187fbf30f5114ce88b9f7ed6070a5abcfa993ca824e07528b01
+  data.tar.gz: f868e81095eca258bbd8c510bbcf45d353774bca61f83ce3d1f89a63616b3f3ee287666e16a33a5d5d06b9496ef71d9d9cf814ffeba2f1e22a939955728566e2

data/lib/fastbeans/connection.rb

@@ -44,7 +44,7 @@ module Fastbeans
       retries = 0
       begin
         call_without_retries(data)
-      rescue Fastbeans::RemoteConnectionFailed => e
+      rescue Fastbeans::RemoteConnectionFailed, Fastbeans::ResponseReadTimeout => e
         Fastbeans.debug(e)
         if retries < MAX_RETRIES
           Fastbeans.debug("Retrying (#{retries} out of #{MAX_RETRIES} retries)")

data/lib/fastbeans/errors.rb

@@ -10,5 +10,6 @@ module Fastbeans
   class RemoteConnectionDead  < Fastbeans::RPCException; end
   class AutogeneratedException < Fastbeans::RPCException; end
   class ResponseSignatureMismatch < RemoteConnectionFailed; end
-  
+  class ResponseReadTimeout < RemoteCallFailed; end
+
 end

data/lib/fastbeans/request.rb

@@ -1,10 +1,13 @@
 require 'digest/md5'
 require 'fastbeans/response'
+require 'timeout'
 
 module Fastbeans
   class Request
     attr_reader :connection
 
+    RESPONSE_READ_TIMEOUT = 120
+
     def initialize(connection)
       @connection = connection
     end
@@ -29,8 +32,13 @@ module Fastbeans
     end
 
     def read_response(sock, call_data)
-      raw_resp = MessagePack.load(sock)
+      raw_resp = Timeout.timeout(RESPONSE_READ_TIMEOUT, Fastbeans::ResponseReadTimeout) do
+        MessagePack.load(sock)
+      end
       Fastbeans::Response.new(call_data, raw_resp)
+    rescue Fastbeans::ResponseReadTimeout
+      @connection.disconnect!
+      raise Fastbeans::ResponseReadTimeout, "Couldn't read response in #{RESPONSE_READ_TIMEOUT} seconds"
     end
 
     def perform(call_data)

data/lib/fastbeans/version.rb

@@ -1,3 +1,3 @@
 module Fastbeans
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastbeans
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Dima Sabanin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack