From 067c6b06d5f44aaad03b8eeb37005e346af9bb87 Mon Sep 17 00:00:00 2001 From: Georgy Sayganov Date: Thu, 27 May 2021 08:51:20 +0300 Subject: [PATCH] Update AddEventBus methods in some projects --- src/Services/Basket/Basket.API/Startup.cs | 9 +++++++-- src/Services/Catalog/Catalog.API/Startup.cs | 9 +++++++-- src/Services/Ordering/Ordering.API/Startup.cs | 9 +++++++-- .../Extensions/CustomExtensionMethods.cs | 9 +++++++-- src/Services/Ordering/Ordering.SignalrHub/Startup.cs | 9 +++++++-- src/Services/Payment/Payment.API/Startup.cs | 9 +++++++-- src/Services/Webhooks/Webhooks.API/Startup.cs | 9 +++++++-- 7 files changed, 49 insertions(+), 14 deletions(-) diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index 45adb5f66..e4a62eb4f 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -296,7 +296,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API { var subscriptionClientName = Configuration["SubscriptionClientName"]; var rabbitMQPersistentConnection = sp.GetRequiredService(); - var iLifetimeScope = sp.GetRequiredService(); + var serviceScopeFactory = sp.GetRequiredService(); var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); @@ -306,7 +306,12 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API retryCount = int.Parse(Configuration["EventBusRetryCount"]); } - return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount); + return new EventBusRabbitMQ(rabbitMQPersistentConnection, + logger, + serviceScopeFactory, + eventBusSubcriptionsManager, + subscriptionClientName, + retryCount); }); } diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs index 4c17fb63f..5b4a483e4 100644 --- a/src/Services/Catalog/Catalog.API/Startup.cs +++ b/src/Services/Catalog/Catalog.API/Startup.cs @@ -345,7 +345,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API { var subscriptionClientName = configuration["SubscriptionClientName"]; var rabbitMQPersistentConnection = sp.GetRequiredService(); - var iLifetimeScope = sp.GetRequiredService(); + var serviceScopeFactory = sp.GetRequiredService(); var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); @@ -355,7 +355,12 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API retryCount = int.Parse(configuration["EventBusRetryCount"]); } - return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount); + return new EventBusRabbitMQ(rabbitMQPersistentConnection, + logger, + serviceScopeFactory, + eventBusSubcriptionsManager, + subscriptionClientName, + retryCount); }); } diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 5813a0578..c417de2b8 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -385,7 +385,7 @@ { var subscriptionClientName = configuration["SubscriptionClientName"]; var rabbitMQPersistentConnection = sp.GetRequiredService(); - var iLifetimeScope = sp.GetRequiredService(); + var serviceScopeFactory = sp.GetRequiredService(); var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); @@ -395,7 +395,12 @@ retryCount = int.Parse(configuration["EventBusRetryCount"]); } - return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount); + return new EventBusRabbitMQ(rabbitMQPersistentConnection, + logger, + serviceScopeFactory, + eventBusSubcriptionsManager, + subscriptionClientName, + retryCount); }); } diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs b/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs index ffdf68161..6bcfe4f73 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs @@ -104,7 +104,7 @@ namespace Ordering.BackgroundTasks.Extensions services.AddSingleton(sp => { var rabbitMQPersistentConnection = sp.GetRequiredService(); - var iLifetimeScope = sp.GetRequiredService(); + var serviceScopeFactory = sp.GetRequiredService(); var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); @@ -115,7 +115,12 @@ namespace Ordering.BackgroundTasks.Extensions retryCount = int.Parse(configuration["EventBusRetryCount"]); } - return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount); + return new EventBusRabbitMQ(rabbitMQPersistentConnection, + logger, + serviceScopeFactory, + eventBusSubcriptionsManager, + subscriptionClientName, + retryCount); }); } diff --git a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs index a4a5d08c7..992134e7e 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs +++ b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs @@ -224,7 +224,7 @@ namespace Ordering.SignalrHub { var subscriptionClientName = Configuration["SubscriptionClientName"]; var rabbitMQPersistentConnection = sp.GetRequiredService(); - var iLifetimeScope = sp.GetRequiredService(); + var serviceScopeFactory = sp.GetRequiredService(); var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); @@ -234,7 +234,12 @@ namespace Ordering.SignalrHub retryCount = int.Parse(Configuration["EventBusRetryCount"]); } - return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount); + return new EventBusRabbitMQ(rabbitMQPersistentConnection, + logger, + serviceScopeFactory, + eventBusSubcriptionsManager, + subscriptionClientName, + retryCount); }); } diff --git a/src/Services/Payment/Payment.API/Startup.cs b/src/Services/Payment/Payment.API/Startup.cs index a39d3b97d..33938e4be 100644 --- a/src/Services/Payment/Payment.API/Startup.cs +++ b/src/Services/Payment/Payment.API/Startup.cs @@ -141,7 +141,7 @@ namespace Payment.API { var subscriptionClientName = Configuration["SubscriptionClientName"]; var rabbitMQPersistentConnection = sp.GetRequiredService(); - var iLifetimeScope = sp.GetRequiredService(); + var serviceScopeFactory = sp.GetRequiredService(); var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); @@ -151,7 +151,12 @@ namespace Payment.API retryCount = int.Parse(Configuration["EventBusRetryCount"]); } - return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount); + return new EventBusRabbitMQ(rabbitMQPersistentConnection, + logger, + serviceScopeFactory, + eventBusSubcriptionsManager, + subscriptionClientName, + retryCount); }); } diff --git a/src/Services/Webhooks/Webhooks.API/Startup.cs b/src/Services/Webhooks/Webhooks.API/Startup.cs index 4744e9d24..64d9dd16e 100644 --- a/src/Services/Webhooks/Webhooks.API/Startup.cs +++ b/src/Services/Webhooks/Webhooks.API/Startup.cs @@ -227,7 +227,7 @@ namespace Webhooks.API { var subscriptionClientName = configuration["SubscriptionClientName"]; var rabbitMQPersistentConnection = sp.GetRequiredService(); - var iLifetimeScope = sp.GetRequiredService(); + var serviceScopeFactory = sp.GetRequiredService(); var logger = sp.GetRequiredService>(); var eventBusSubcriptionsManager = sp.GetRequiredService(); @@ -237,7 +237,12 @@ namespace Webhooks.API retryCount = int.Parse(configuration["EventBusRetryCount"]); } - return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount); + return new EventBusRabbitMQ(rabbitMQPersistentConnection, + logger, + serviceScopeFactory, + eventBusSubcriptionsManager, + subscriptionClientName, + retryCount); }); }