Skip to content

Close downstream connections when upstream connection closes. #220

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
markusgust merged 4 commits into from
Sep 12, 2025
Merged

Close downstream connections when upstream connection closes. #220

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f8f02a
close downstream connections when upstream close
markusgust Sep 3, 2025
0623630
some reorganisation
markusgust Sep 3, 2025
4b06493
no need to include client
markusgust Sep 3, 2025
574805c
log once not for each closure
markusgust Sep 4, 2025
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
17 changes: 11 additions & 6 deletions src/amqproxy/upstream.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ module AMQProxy
when AMQ::Protocol::Frame::Heartbeat then send frame
when AMQ::Protocol::Frame::Connection::Close
Log.error { "Upstream closed connection: #{frame.reply_text} #{frame.reply_code}" }
close_all_client_channels(frame.reply_code, frame.reply_text)
close_all_downstream_client_connections(frame.reply_code, frame.reply_text)
begin
send AMQ::Protocol::Frame::Connection::CloseOk.new
rescue WriteError
Expand Down Expand Up @@ -106,19 +106,24 @@ module AMQProxy
Log.info { "Connection error #{ex.inspect}" } unless socket.closed?
ensure
socket.close rescue nil
close_all_client_channels
close_all_downstream_client_connections
end

def closed?
@socket.closed?
end

private def close_all_client_channels(code = 500_u16, reason = "UPSTREAM_ERROR")
private def close_all_downstream_client_connections(code = 500_u16, reason = "UPSTREAM_ERROR")
clients = Set(Client).new
@channels_lock.synchronize do
return if @channels.empty?
Log.debug { "Upstream connection closed, closing #{@channels.size} client channels" }
@channels.each_value do |downstream_channel|
downstream_channel.close(code, reason)
Log.debug { "Upstream connection closed, closing #{@channels.size} client connections" }
@channels.each_value do |downstream_connection|
clients << downstream_connection.client
end

clients.each do |client|
client.close_connection(code, reason)
end
@channels.clear
end
Expand Down