From 193a68a100710a8faefbcb131ce413b3a2ce7083 Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Mon, 6 Jan 2014 13:47:15 +0000 Subject: Revert the changes to the error thrown. --- src/rabbit_reader.erl | 2 +- src/rabbit_writer.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 52127300..edcc974f 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -806,7 +806,7 @@ handle_method0(MethodName, FieldsBin, try handle_method0(Protocol:decode_method_fields(MethodName, FieldsBin), State) - catch throw:{writer_inet_error, closed} -> + catch throw:{inet_error, closed} -> maybe_emit_stats(State), throw(connection_closed_abruptly); exit:#amqp_error{method = none} = Reason -> diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl index 92d48e63..34dd3d3b 100644 --- a/src/rabbit_writer.erl +++ b/src/rabbit_writer.erl @@ -272,7 +272,7 @@ assemble_frames(Channel, MethodRecord, Content, FrameMax, Protocol) -> [MethodFrame | ContentFrames]. tcp_send(Sock, Data) -> - rabbit_misc:throw_on_error(writer_inet_error, + rabbit_misc:throw_on_error(inet_error, fun () -> rabbit_net:send(Sock, Data) end). internal_send_command(Sock, Channel, MethodRecord, Protocol) -> -- cgit v1.2.1