Skip to content

AMQP 1.0 client: gracefully handle connection termination in more places (backport #17013) #17015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkuratczyk merged 1 commit into from
Jul 23, 2026
+18 −5
Merged

AMQP 1.0 client: gracefully handle connection termination in more places (backport #17013) #17015

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions deps/amqp10_client/src/amqp10_client_connection.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,10 @@ sasl_hdr_rcvds(_EvtType, #'v1_0.sasl_mechanisms'{
sasl_hdr_rcvds({call, From}, begin_session,
#state{pending_session_reqs = PendingSessionReqs} = State) ->
State1 = State#state{pending_session_reqs = [From | PendingSessionReqs]},
{keep_state, State1}.
{keep_state, State1};
sasl_hdr_rcvds(info, {'DOWN', MRef, process, _Pid, _},
#state{reader_m_ref = MRef}) ->
{stop, {shutdown, reader_down}}.

sasl_init_sent(_EvtType, #'v1_0.sasl_outcome'{code = {ubyte, 0}},
#state{socket = Socket} = State) ->
Expand All @@ -239,7 +242,10 @@ sasl_init_sent(_EvtType, #'v1_0.sasl_outcome'{code = {ubyte, C}},
sasl_init_sent({call, From}, begin_session,
#state{pending_session_reqs = PendingSessionReqs} = State) ->
State1 = State#state{pending_session_reqs = [From | PendingSessionReqs]},
{keep_state, State1}.
{keep_state, State1};
sasl_init_sent(info, {'DOWN', MRef, process, _Pid, _},
#state{reader_m_ref = MRef}) ->
{stop, {shutdown, reader_down}}.

hdr_sent(_EvtType, {protocol_header_received, 0, 1, 0, 0}, State) ->
case send_open(State) of
Expand All @@ -254,7 +260,10 @@ hdr_sent(_EvtType, {protocol_header_received, Protocol, Maj, Min,
hdr_sent({call, From}, begin_session,
#state{pending_session_reqs = PendingSessionReqs} = State) ->
State1 = State#state{pending_session_reqs = [From | PendingSessionReqs]},
{keep_state, State1}.
{keep_state, State1};
hdr_sent(info, {'DOWN', MRef, process, _Pid, _},
#state{reader_m_ref = MRef}) ->
{stop, {shutdown, reader_down}}.

open_sent(_EvtType, #'v1_0.open'{max_frame_size = MaybeMaxFrameSize,
idle_time_out = Timeout} = Open,
Expand Down Expand Up @@ -350,11 +359,15 @@ opened(_EvtType, Frame, State) ->
close_sent(_EvtType, heartbeat, _Data) ->
keep_state_and_data;
close_sent(_EvtType, {'EXIT', _Pid, shutdown}, _Data) ->
%% monitored processes may exit during closure
%% our supervisor is shutting us down; let it enforce its own timeout
keep_state_and_data;
close_sent(_EvtType, {'EXIT', _Pid, {shutdown, _}}, _Data) ->
%% monitored processes may exit during closure
%% our supervisor is shutting us down; let it enforce its own timeout
keep_state_and_data;
close_sent(_EvtType, {'EXIT', _Pid, _Reason}, _Data) ->
%% a linked process exited unexpectedly; we probably won't
%% receive a close frame
{stop, normal};
close_sent(_EvtType, {'DOWN', _Ref, process, ReaderPid, _Reason},
#state{reader = ReaderPid}) ->
%% if the reader exits we probably won't receive a close frame
Expand Down
Loading