From 0161b468cadbf4dc13051ccbd69e38cbde772836 Mon Sep 17 00:00:00 2001 From: Christina Date: Thu, 23 Jan 2025 14:09:41 +0100 Subject: [PATCH] rebase --- src/lavinmq/amqp/connection_factory.cr | 6 +++--- src/lavinmq/server.cr | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lavinmq/amqp/connection_factory.cr b/src/lavinmq/amqp/connection_factory.cr index 2169ae3ae0..41c26d4ded 100644 --- a/src/lavinmq/amqp/connection_factory.cr +++ b/src/lavinmq/amqp/connection_factory.cr @@ -10,17 +10,17 @@ module LavinMQ Log = LavinMQ::Log.for "amqp.connection_factory" def initialize(@users : UserStore, @vhosts : VHostStore) + @auth_chain = LavinMQ::Auth::Chain.new(@users) end - def start(socket, connection_info, auth_chain) : Client? - @auth_chain = LavinMQ::Auth::Chain.new(users) + def start(socket, connection_info) : Client? remote_address = connection_info.src socket.read_timeout = 15.seconds metadata = ::Log::Metadata.build({address: remote_address.to_s}) logger = Logger.new(Log, metadata) if confirm_header(socket, logger) if start_ok = start(socket, logger) - if user = authenticate(socket, remote_address, start_ok, logger, auth_chain) + if user = authenticate(socket, remote_address, start_ok, logger, @auth_chain) if tune_ok = tune(socket, logger) if vhost = open(socket, user, logger) socket.read_timeout = heartbeat_timeout(tune_ok) diff --git a/src/lavinmq/server.cr b/src/lavinmq/server.cr index b2d85b68ab..6a7dcf1d90 100644 --- a/src/lavinmq/server.cr +++ b/src/lavinmq/server.cr @@ -246,7 +246,7 @@ module LavinMQ end def handle_connection(socket, connection_info) - client = @amqp_connection_factory.start(socket, connection_info, @auth_chain) + client = @amqp_connection_factory.start(socket, connection_info) ensure socket.close if client.nil? end