add a case clause to bubble timeouts

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@666454 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/lib/alterl/src/thrift_binary_protocol.erl b/lib/alterl/src/thrift_binary_protocol.erl
index da43d14..c1f9d4e 100644 (file)
--- a/lib/alterl/src/thrift_binary_protocol.erl
+++ b/lib/alterl/src/thrift_binary_protocol.erl
@@ -178,6 +178,7 @@ read(This, message_begin) ->
                                     seqid = SeqId};
 
         Err = {error, closed} -> Err;
+        Err = {error, timeout}-> Err;
         Err = {error, ebadf}  -> Err
     end;
 

diff --git a/lib/alterl/src/thrift_socket_transport.erl b/lib/alterl/src/thrift_socket_transport.erl
index 9d15ee1..9cc0af9 100644 (file)
--- a/lib/alterl/src/thrift_socket_transport.erl
+++ b/lib/alterl/src/thrift_socket_transport.erl
@@ -31,7 +31,7 @@ read(#data{socket=Socket, recv_timeout=Timeout}, Len)
   when is_integer(Len), Len >= 0 ->
     case gen_tcp:recv(Socket, Len, Timeout) of
         Err = {error, timeout} ->
-            error_logger:error_msg("read timeout for conn with ~p", [inet:peername(Socket)]),
+            error_logger:info_msg("read timeout: peer conn ~p", [inet:peername(Socket)]),
             gen_tcp:close(Socket),
             Err;
         Data -> Data