diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-12-17 15:42:06 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-12-17 15:42:06 +0000 |
| commit | 421ce43b4588d2902dcff3e79ef0cd37082958f8 (patch) | |
| tree | 145cb4111bb48f43d0350089fbe48f9a1727a1ef | |
| parent | 6954457553913500a7674d581bd2a62ff581283b (diff) | |
| download | rabbitmq-server-git-421ce43b4588d2902dcff3e79ef0cd37082958f8.tar.gz | |
Treat connection errors on write the same as on read.
| -rw-r--r-- | src/rabbit_reader.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_writer.erl | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 46c5c42a45..3262923556 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -808,6 +808,9 @@ handle_method0(MethodName, FieldsBin, State) catch exit:#amqp_error{method = none} = Reason -> handle_exception(State, 0, Reason#amqp_error{method = MethodName}); + throw:{writer_inet_error, closed} -> + maybe_emit_stats(State), + throw(connection_closed_abruptly); Type:Reason -> Stack = erlang:get_stacktrace(), handle_exception(State, 0, {Type, Reason, MethodName, Stack}) diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl index 34dd3d3b35..92d48e633f 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(inet_error, + rabbit_misc:throw_on_error(writer_inet_error, fun () -> rabbit_net:send(Sock, Data) end). internal_send_command(Sock, Channel, MethodRecord, Protocol) -> |