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

Merge branch 'stable'

This commit is contained in:
Jean-Sébastien Pédron 2017-06-26 18:25:46 +02:00
parent 19fbb09413 c655213f53
commit b0f24916f8
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deps/amqp_client/src/amqp_channel.erl vendored
View File

@ -500,7 +500,7 @@ handle_info({channel_exit, _ChNumber, Reason}, State) ->
handle_channel_exit(Reason, State); handle_channel_exit(Reason, State);
%% This comes from rabbit_channel in the direct case %% This comes from rabbit_channel in the direct case
handle_info({channel_closing, ChPid}, State) -> handle_info({channel_closing, ChPid}, State) ->
ok = rabbit_channel:ready_for_close(ChPid), ok = rabbit_channel_common:ready_for_close(ChPid),
{noreply, State}; {noreply, State};
%% @private %% @private
handle_info({bump_credit, Msg}, State) -> handle_info({bump_credit, Msg}, State) ->
@ -864,9 +864,9 @@ do(Method, Content, Flow, #state{driver = network, writer = W}) ->
do(Method, Content, Flow, #state{driver = direct, writer = W}) -> do(Method, Content, Flow, #state{driver = direct, writer = W}) ->
%% ditto catching because... %% ditto catching because...
catch case {Content, Flow} of catch case {Content, Flow} of
{none, _} -> rabbit_channel:do(W, Method); {none, _} -> rabbit_channel_common:do(W, Method);
{_, flow} -> rabbit_channel:do_flow(W, Method, Content); {_, flow} -> rabbit_channel_common:do_flow(W, Method, Content);
{_, noflow} -> rabbit_channel:do(W, Method, Content) {_, noflow} -> rabbit_channel_common:do(W, Method, Content)
end. end.
@ -881,13 +881,13 @@ flush_writer(#state{driver = direct}) ->
amqp_msg(none) -> amqp_msg(none) ->
none; none;
amqp_msg(Content) -> amqp_msg(Content) ->
{Props, Payload} = rabbit_basic:from_content(Content), {Props, Payload} = rabbit_basic_common:from_content(Content),
#amqp_msg{props = Props, payload = Payload}. #amqp_msg{props = Props, payload = Payload}.
build_content(none) -> build_content(none) ->
none; none;
build_content(#amqp_msg{props = Props, payload = Payload}) -> build_content(#amqp_msg{props = Props, payload = Payload}) ->
rabbit_basic:build_content(Props, Payload). rabbit_basic_common:build_content(Props, Payload).
check_block(_Method, _AmqpMsg, #state{closing = {just_channel, _}}) -> check_block(_Method, _AmqpMsg, #state{closing = {just_channel, _}}) ->
closing; closing;

4
deps/amqp_client/src/amqp_channels_manager.erl vendored
View File

@ -63,9 +63,9 @@ signal_connection_closing(ChMgr, ChannelCloseType, Reason) ->
process_channel_frame(Frame, Channel, ChPid, AState) -> process_channel_frame(Frame, Channel, ChPid, AState) ->
case rabbit_command_assembler:process(Frame, AState) of case rabbit_command_assembler:process(Frame, AState) of
{ok, NewAState} -> NewAState; {ok, NewAState} -> NewAState;
{ok, Method, NewAState} -> rabbit_channel:do(ChPid, Method), {ok, Method, NewAState} -> rabbit_channel_common:do(ChPid, Method),
NewAState; NewAState;
{ok, Method, Content, NewAState} -> rabbit_channel:do(ChPid, Method, {ok, Method, Content, NewAState} -> rabbit_channel_common:do(ChPid, Method,
Content), Content),
NewAState; NewAState;
{error, Reason} -> ChPid ! {channel_exit, Channel, {error, Reason} -> ChPid ! {channel_exit, Channel,

2
deps/amqp_client/src/amqp_direct_connection.erl vendored
View File

@ -88,7 +88,7 @@ closing(_ChannelCloseType, Reason, State) ->
channels_terminated(State = #state{closing_reason = Reason, channels_terminated(State = #state{closing_reason = Reason,
collector = Collector}) -> collector = Collector}) ->
rabbit_queue_collector:delete_all(Collector), rabbit_queue_collector_common:delete_all(Collector),
{stop, {shutdown, Reason}, State}. {stop, {shutdown, Reason}, State}.
terminate(_Reason, #state{node = Node} = State) -> terminate(_Reason, #state{node = Node} = State) ->