From 67dff546903dad1e298f1cd85d3d1ccb7e08d9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20H=C3=B6rberg?= Date: Mon, 19 Feb 2024 01:19:28 +0100 Subject: [PATCH] fixups --- src/amqproxy/client.cr | 5 +++-- src/amqproxy/upstream.cr | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/amqproxy/client.cr b/src/amqproxy/client.cr index 81251da..5923286 100644 --- a/src/amqproxy/client.cr +++ b/src/amqproxy/client.cr @@ -6,6 +6,7 @@ require "./records" module AMQProxy class Client + Log = ::Log.for(self) getter credentials : Credentials @channel_map = Hash(UInt16, UpstreamChannel).new @outgoing_frames = Channel(AMQ::Protocol::Frame).new(128) @@ -58,7 +59,7 @@ module AMQProxy end end end - rescue ex : IO::Error | OpenSSL::SSL::Error + rescue ex : IO::Error raise Error.new("Client disconnected", ex) unless socket.closed? ensure @outgoing_frames.close @@ -72,7 +73,7 @@ module AMQProxy break if frame.is_a? AMQ::Protocol::Frame::Connection::CloseOk end - rescue ex : IO::Error | OpenSSL::SSL::Error + rescue ex : IO::Error raise ex unless socket.closed? ensure @outgoing_frames.close diff --git a/src/amqproxy/upstream.cr b/src/amqproxy/upstream.cr index dd814c1..3ea7a3f 100644 --- a/src/amqproxy/upstream.cr +++ b/src/amqproxy/upstream.cr @@ -113,6 +113,7 @@ module AMQProxy end private def close_all_client_channels + Log.debug { "Closing all client channels for closed upstream" } @channels_lock.synchronize do @channels.each_value do |downstream_channel| downstream_channel.try &.close