root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

If the client initiates the connection close, it will close the socket rather than waiting for the server

This commit is contained in:
Ben Hood 2009-01-06 18:07:55 +00:00
parent 6c802f0ecf
commit 118c962486
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deps/amqp_client/src/amqp_network_driver.erl vendored
View File

@ -78,7 +78,7 @@ close_channel(WriterPid) ->
%% This closes the writer down, waits for the confirmation from the
%% the channel and then returns the ack to the user
close_connection(Close = #'connection.close'{}, From,
#connection_state{channel0_writer_pid = Writer, reader_pid = Reader}) ->
#connection_state{channel0_writer_pid = Writer}) ->
rabbit_writer:send_command(Writer, Close),
rabbit_writer:shutdown(Writer),
receive
@ -87,8 +87,7 @@ close_connection(Close = #'connection.close'{}, From,
after
5000 ->
exit(timeout_on_exit)
end,
erlang:send_after(?SOCKET_CLOSING_TIMEOUT, Reader, close).
end.
do(Writer, Method) -> rabbit_writer:send_command(Writer, Method).
do(Writer, Method, Content) -> rabbit_writer:send_command(Writer, Method, Content).
@ -98,7 +97,7 @@ handle_broker_close(#connection_state{channel0_writer_pid = Writer,
CloseOk = #'connection.close_ok'{},
rabbit_writer:send_command(Writer, CloseOk),
rabbit_writer:shutdown(Writer),
Reader ! close.
erlang:send_after(?SOCKET_CLOSING_TIMEOUT, Reader, close).
%---------------------------------------------------------------------------
% AMQP message sending and receiving
@ -166,9 +165,13 @@ start_writer(Sock, Channel) ->
reader_loop(Sock, Type, Channel, Length) ->
receive
{inet_async, Sock, _, {ok, <<Payload:Length/binary,?FRAME_END>>} } ->
handle_frame(Type, Channel, Payload),
{ok, _Ref} = prim_inet:async_recv(Sock, 7, -1),
reader_loop(Sock, undefined, undefined, undefined);
case handle_frame(Type, Channel, Payload) of
closed_ok ->
ok;
_ ->
{ok, _Ref} = prim_inet:async_recv(Sock, 7, -1),
reader_loop(Sock, undefined, undefined, undefined)
end;
{inet_async, Sock, _, {ok, <<_Type:8,_Channel:16,PayloadSize:32>>}} ->
{ok, _Ref} = prim_inet:async_recv(Sock, PayloadSize + 1, -1),
reader_loop(Sock, _Type, _Channel, PayloadSize);
@ -206,6 +209,9 @@ handle_frame(Type, Channel, Payload) ->
rabbit_misc:die(frame_error);
trace when Channel /= 0 ->
rabbit_misc:die(frame_error);
{method,'connection.close_ok',Content} ->
send_frame(Channel, {method, 'connection.close_ok', Content}),
closed_ok;
AnalyzedFrame ->
send_frame(Channel, AnalyzedFrame)
end.