From 3665fa8a222bf10a4c7ccab4112115673e926ebd Mon Sep 17 00:00:00 2001 From: Young Date: Mon, 28 Oct 2024 23:31:13 +0800 Subject: [PATCH] optimise codes --- .../RabbitMQ/RabbitMQEventBus.cs | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/Infrastructure.EventBus/RabbitMQ/RabbitMQEventBus.cs b/src/Infrastructure.EventBus/RabbitMQ/RabbitMQEventBus.cs index b5c7c68..8c5b967 100644 --- a/src/Infrastructure.EventBus/RabbitMQ/RabbitMQEventBus.cs +++ b/src/Infrastructure.EventBus/RabbitMQ/RabbitMQEventBus.cs @@ -28,14 +28,14 @@ public class RabbitMQEventBus : IEventBus IEventBusSubscriptionManager subscriptionsManager, IServiceProvider serviceProvider, ILogger logger, - string brokerName, + string exchangeName, string queueName) { _persistentConnection = persistentConnection ?? throw new ArgumentNullException(nameof(persistentConnection)); _subscriptionsManager = subscriptionsManager ?? throw new ArgumentNullException(nameof(subscriptionsManager)); _serviceProvider = serviceProvider; _logger = logger; - _exchangeName = brokerName ?? throw new ArgumentNullException(nameof(brokerName)); + _exchangeName = exchangeName ?? throw new ArgumentNullException(nameof(exchangeName)); _queueName = queueName ?? throw new ArgumentNullException(nameof(queueName)); ConfigureMessageBroker(); @@ -140,15 +140,8 @@ public class RabbitMQEventBus : IEventBus var channel = _persistentConnection.CreateModel(); - channel.ExchangeDeclare(exchange: _exchangeName, type: "direct"); - channel.QueueDeclare - ( - queue: _queueName, - durable: true, - exclusive: false, - autoDelete: false, - arguments: null - ); + channel.ExchangeDeclare(_exchangeName, ExchangeType.Direct); + channel.QueueDeclare(_queueName, true, false, false, null); channel.CallbackException += (sender, ea) => { @@ -175,12 +168,7 @@ public class RabbitMQEventBus : IEventBus var consumer = new AsyncEventingBasicConsumer(_consumerChannel); consumer.Received += Consumer_Received; - _consumerChannel.BasicConsume - ( - queue: _queueName, - autoAck: false, - consumer: consumer - ); + _consumerChannel.BasicConsume(_queueName, false, consumer); _logger.LogTrace("Started RabbitMQ basic consume."); } @@ -270,7 +258,7 @@ public class RabbitMQEventBus : IEventBus } using var channel = _persistentConnection.CreateModel(); - channel.QueueUnbind(queue: _queueName, exchange: _exchangeName, routingKey: eventName); + channel.QueueUnbind(_queueName, _exchangeName, eventName); if (_subscriptionsManager.IsEmpty) { @@ -292,7 +280,7 @@ public class RabbitMQEventBus : IEventBus } using var channel = _persistentConnection.CreateModel(); - channel.QueueBind(queue: _queueName, exchange: _exchangeName, routingKey: eventName); + channel.QueueBind(_queueName, _exchangeName, eventName); } private void PersistentConnection_OnReconnectedAfterConnectionFailure(object sender, EventArgs e)