merge bug18784

2 files changed, 11 insertions, 3 deletions

diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 1d11cbaaea..bfd1ea72ff 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -59,6 +59,7 @@
 %% all states, unless specified otherwise:
 %%   socket error -> *exit*
 %%   socket close -> *throw*
+%%   writer send failure -> *throw*
 %%   forced termination -> *exit*
 %%   handshake_timeout -> *throw*
 %% pre-init:
@@ -230,6 +231,8 @@ mainloop(Parent, Deb, State = #v1{sock= Sock, recv_ref = Ref}) ->
             %% since this termination is initiated by our parent it is
             %% probably more important to exit quickly.
             exit(Reason);
+        {'EXIT', _Pid, E = {writer, send_failed, _Error}} ->
+            throw(E);
         {'EXIT', Pid, Reason} ->
             mainloop(Parent, Deb, handle_dependent_exit(Pid, Reason, State));
         {terminate_channel, Channel, Ref1} ->
diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl
index eda871ecc7..0f6bca91bc 100644
--- a/src/rabbit_writer.erl
+++ b/src/rabbit_writer.erl
@@ -153,10 +153,15 @@ internal_send_command(Sock, Channel, MethodRecord, Content, FrameMax) ->
 %% when these are full. So the fact that we process the result
 %% asynchronously does not impact flow control.
 internal_send_command_async(Sock, Channel, MethodRecord) ->
-    true = erlang:port_command(Sock, assemble_frames(Channel, MethodRecord)),
+    true = port_cmd(Sock, assemble_frames(Channel, MethodRecord)),
     ok.
 
 internal_send_command_async(Sock, Channel, MethodRecord, Content, FrameMax) ->
-    true = erlang:port_command(Sock, assemble_frames(Channel, MethodRecord,
-                                                     Content, FrameMax)),
+    true = port_cmd(Sock, assemble_frames(Channel, MethodRecord,
+                                              Content, FrameMax)),
     ok.
+
+port_cmd(Sock, Data) ->
+    try erlang:port_command(Sock, Data)
+    catch error:Error -> exit({writer, send_failed, Error})
+    end.