From aeddf51a339ee31072228b81aaa2b11a689676d1 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Sat, 29 Apr 2017 21:58:11 -0700 Subject: [PATCH] Refactoring to better terms --- .../DefaultRabbitMQPersisterConnection.cs | 12 +++---- .../EventBusRabbitMQ/EventBusRabbitMQ.cs | 31 +++++++++---------- .../IRabbitMQPersisterConnection.cs | 3 +- src/Services/Basket/Basket.API/Startup.cs | 6 ++-- src/Services/Catalog/Catalog.API/Startup.cs | 6 ++-- src/Services/Ordering/Ordering.API/Startup.cs | 6 ++-- 6 files changed, 31 insertions(+), 33 deletions(-) diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersisterConnection.cs b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersisterConnection.cs index 894afb4e4..0aafaf90a 100644 --- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersisterConnection.cs +++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersisterConnection.cs @@ -10,18 +10,18 @@ using System.Net.Sockets; namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ { - public class DefaultRabbitMQPersisterConnection - : IRabbitMQPersisterConnection + public class DefaultRabbitMQPersistentConnection + : IRabbitMQPersistentConnection { private readonly IConnectionFactory _connectionFactory; - private readonly ILogger _logger; + private readonly ILogger _logger; IConnection _connection; bool _disposed; object sync_root = new object(); - public DefaultRabbitMQPersisterConnection(IConnectionFactory connectionFactory,ILogger logger) + public DefaultRabbitMQPersistentConnection(IConnectionFactory connectionFactory,ILogger logger) { _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); @@ -87,13 +87,13 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ _connection.CallbackException += OnCallbackException; _connection.ConnectionBlocked += OnConnectionBlocked; - _logger.LogInformation($"RabbitMQ persister connection acquire a connection {_connection.Endpoint.HostName} and is subscribed to failure events"); + _logger.LogInformation($"RabbitMQ persistent connection acquired a connection {_connection.Endpoint.HostName} and is subscribed to failure events"); return true; } else { - _logger.LogCritical("FATAL ERROR: RabbitMQ connections can't be created and opened"); + _logger.LogCritical("FATAL ERROR: RabbitMQ connections could not be created and opened"); return false; } diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs index e7a493c10..0eb29b72b 100644 --- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs +++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs @@ -21,7 +21,7 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ { const string BROKER_NAME = "eshop_event_bus"; - private readonly IRabbitMQPersisterConnection _persisterConnection; + private readonly IRabbitMQPersistentConnection _persistentConnection; private readonly ILogger _logger; private readonly Dictionary> _handlers @@ -33,20 +33,19 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ private IModel _consumerChannel; private string _queueName; - public EventBusRabbitMQ(IRabbitMQPersisterConnection persisterConnection, ILogger logger) + public EventBusRabbitMQ(IRabbitMQPersistentConnection persistentConnection, ILogger logger) { - _persisterConnection = persisterConnection ?? throw new ArgumentNullException(nameof(persisterConnection)); + _persistentConnection = persistentConnection ?? throw new ArgumentNullException(nameof(persistentConnection)); _logger = logger ?? throw new ArgumentNullException(nameof(logger)); _consumerChannel = CreateConsumerChannel(); } - public void Publish(IntegrationEvent @event) { - if (!_persisterConnection.IsConnected) + if (!_persistentConnection.IsConnected) { - _persisterConnection.TryConnect(); + _persistentConnection.TryConnect(); } var policy = RetryPolicy.Handle() @@ -56,7 +55,7 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ _logger.LogWarning(ex.ToString()); }); - using (var channel = _persisterConnection.CreateModel()) + using (var channel = _persistentConnection.CreateModel()) { var eventName = @event.GetType() .Name; @@ -87,12 +86,12 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ } else { - if (!_persisterConnection.IsConnected) + if (!_persistentConnection.IsConnected) { - _persisterConnection.TryConnect(); + _persistentConnection.TryConnect(); } - using (var channel = _persisterConnection.CreateModel()) + using (var channel = _persistentConnection.CreateModel()) { channel.QueueBind(queue: _queueName, exchange: BROKER_NAME, @@ -125,12 +124,12 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ { _eventTypes.Remove(eventType); - if (!_persisterConnection.IsConnected) + if (!_persistentConnection.IsConnected) { - _persisterConnection.TryConnect(); + _persistentConnection.TryConnect(); } - using (var channel = _persisterConnection.CreateModel()) + using (var channel = _persistentConnection.CreateModel()) { channel.QueueUnbind(queue: _queueName, exchange: BROKER_NAME, @@ -160,12 +159,12 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ private IModel CreateConsumerChannel() { - if (!_persisterConnection.IsConnected) + if (!_persistentConnection.IsConnected) { - _persisterConnection.TryConnect(); + _persistentConnection.TryConnect(); } - var channel = _persisterConnection.CreateModel(); + var channel = _persistentConnection.CreateModel(); channel.ExchangeDeclare(exchange: BROKER_NAME, type: "direct"); diff --git a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersisterConnection.cs b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersisterConnection.cs index b9debe743..5893791c5 100644 --- a/src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersisterConnection.cs +++ b/src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersisterConnection.cs @@ -3,8 +3,7 @@ using System; namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ { - - public interface IRabbitMQPersisterConnection + public interface IRabbitMQPersistentConnection : IDisposable { bool IsConnected { get; } diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 60fc46de2..da9baac48 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -68,16 +68,16 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API }); - services.AddSingleton(sp => + services.AddSingleton(sp => { var settings = sp.GetRequiredService>().Value; - var logger = sp.GetRequiredService>(); + var logger = sp.GetRequiredService>(); var factory = new ConnectionFactory() { HostName = settings.EventBusConnection }; - return new DefaultRabbitMQPersisterConnection(factory, logger); + return new DefaultRabbitMQPersistentConnection(factory, logger); }); services.AddSingleton(); diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs index c13ac2d1b..1c1408b67 100644 --- a/src/Services/Catalog/Catalog.API/Startup.cs +++ b/src/Services/Catalog/Catalog.API/Startup.cs @@ -103,16 +103,16 @@ services.AddTransient(); - services.AddSingleton(sp => + services.AddSingleton(sp => { var settings = sp.GetRequiredService>().Value; - var logger = sp.GetRequiredService>(); + var logger = sp.GetRequiredService>(); var factory = new ConnectionFactory() { HostName = settings.EventBusConnection }; - return new DefaultRabbitMQPersisterConnection(factory, logger); + return new DefaultRabbitMQPersistentConnection(factory, logger); }); services.AddSingleton(); diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 0d6e222b6..6665908a6 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -107,16 +107,16 @@ var serviceProvider = services.BuildServiceProvider(); services.AddTransient(); - services.AddSingleton(sp => + services.AddSingleton(sp => { - var logger = sp.GetRequiredService>(); + var logger = sp.GetRequiredService>(); var factory = new ConnectionFactory() { HostName = Configuration["EventBusConnection"] }; - return new DefaultRabbitMQPersisterConnection(factory, logger); + return new DefaultRabbitMQPersistentConnection(factory, logger); }); services.AddSingleton();