diff options
author | Ben Hood <0x6e6562@gmail.com> | 2008-10-04 16:39:22 +0100 |
---|---|---|
committer | Ben Hood <0x6e6562@gmail.com> | 2008-10-04 16:39:22 +0100 |
commit | edbc8f0a784fb374cb431db83bd0811a86a3a2a5 (patch) | |
tree | a26664d5a94ae2f39be9ad06ee451fe1c7d3ac7e | |
parent | 581757b0122d58aaac458c7f03e7576ac928453e (diff) | |
parent | 95290d890764703feb711f30438779bd9106f9d5 (diff) | |
download | rabbitmq-server-edbc8f0a784fb374cb431db83bd0811a86a3a2a5.tar.gz |
Merged bug19219 into default
-rw-r--r-- | src/rabbit_reader.erl | 3 | ||||
-rw-r--r-- | src/rabbit_writer.erl | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 1d11cbaa..bfd1ea72 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 eda871ec..0f6bca91 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. |