Author: dreiss
Date: Tue Jun 10 18:02:47 2008
New Revision: 666454
URL: http://svn.apache.org/viewvc?rev=666454&view=rev
Log:
add a case clause to bubble timeouts
Modified:
incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl
incubator/thrift/trunk/lib/alterl/src/thrift_socket_transport.erl
Modified: incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl?rev=666454&r1=666453&r2=666454&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl (original)
+++ incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl Tue Jun 10
18:02:47 2008
@@ -178,6 +178,7 @@
seqid = SeqId};
Err = {error, closed} -> Err;
+ Err = {error, timeout}-> Err;
Err = {error, ebadf} -> Err
end;
Modified: incubator/thrift/trunk/lib/alterl/src/thrift_socket_transport.erl
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/alterl/src/thrift_socket_transport.erl?rev=666454&r1=666453&r2=666454&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/alterl/src/thrift_socket_transport.erl (original)
+++ incubator/thrift/trunk/lib/alterl/src/thrift_socket_transport.erl Tue Jun
10 18:02:47 2008
@@ -31,7 +31,7 @@
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
