fix(IntegrationEventBus): Fix integration event causing startup to fail (#158)

Author: zhenlei520

src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents/Processor/RetryByLocalQueueProcessor.cs

@@ -5,7 +5,6 @@ namespace Masa.Contrib.Dispatcher.IntegrationEvents.Processor;
 
 public class RetryByLocalQueueProcessor : ProcessorBase
 {
-    private readonly IServiceProvider _serviceProvider;
     private readonly IOptionsMonitor<AppConfig>? _appConfig;
     private readonly IOptions<DispatcherOptions> _options;
     private readonly ILogger<RetryByLocalQueueProcessor>? _logger;
@@ -18,7 +17,6 @@ public RetryByLocalQueueProcessor(
         IOptionsMonitor<AppConfig>? appConfig = null,
         ILogger<RetryByLocalQueueProcessor>? logger = null) : base(serviceProvider)
     {
-        _serviceProvider = serviceProvider;
         _appConfig = appConfig;
         _options = options;
         _logger = logger;

src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents/Servers/DefaultHostedService.cs

@@ -16,7 +16,7 @@ public DefaultHostedService(IServiceProvider serviceProvider, IEnumerable<IProce
 
     public Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        if (_serviceProvider.GetService<IUnitOfWorkManager>() == null || _serviceProvider.GetService<IIntegrationEventLogService>() == null)
+        if (_serviceProvider.GetService<IUnitOfWorkManager>() == null)
             return Task.CompletedTask;
 
         var processorTasks = _processors.Select(processor => new InfiniteLoopProcessor(_serviceProvider, processor))

src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents/ServiceCollectionExtensions.cs

@@ -61,11 +61,16 @@ internal static IServiceCollection TryAddIntegrationEventBus(
         LocalQueueProcessor.SetLogger(services);
         services.AddScoped<IIntegrationEventBus, IntegrationEventBus>();
         action?.Invoke();
-        services.AddSingleton<IProcessor, RetryByDataProcessor>();
-        services.AddSingleton<IProcessor, RetryByLocalQueueProcessor>();
-        services.AddSingleton<IProcessor, DeletePublishedExpireEventProcessor>();
-        services.AddSingleton<IProcessor, DeleteLocalQueueExpiresProcessor>();
+
+        if (services.Any(d => d.ServiceType == typeof(IIntegrationEventLogService)))
+        {
+            services.AddSingleton<IProcessor, RetryByDataProcessor>();
+            services.AddSingleton<IProcessor, RetryByLocalQueueProcessor>();
+            services.AddSingleton<IProcessor, DeletePublishedExpireEventProcessor>();
+            services.AddSingleton<IProcessor, DeleteLocalQueueExpiresProcessor>();
+        }
         services.TryAddSingleton<IProcessingServer, DefaultHostedService>();
+
         services.AddHostedService<IntegrationEventHostedService>();
         if (services.All(service => service.ServiceType != typeof(IUnitOfWork)))
         {

test/Masa.Contrib.Dispatcher.IntegrationEvents.Tests/IntegrationEventBusTest.cs

@@ -1,10 +1,6 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-using Masa.Contrib.Dispatcher.IntegrationEvents.Tests.Events;
-using Masa.Contrib.Dispatcher.IntegrationEvents.Tests.Infrastructure;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-
 namespace Masa.Contrib.Dispatcher.IntegrationEvents.Tests;
 
 [TestClass]

test/Masa.Contrib.Dispatcher.IntegrationEvents.Tests/_Imports.cs

@@ -9,8 +9,11 @@
 global using Masa.BuildingBlocks.Dispatcher.IntegrationEvents.Logs;
 global using Masa.Contrib.Dispatcher.IntegrationEvents.Options;
 global using Masa.Contrib.Dispatcher.IntegrationEvents.Processor;
+global using Masa.Contrib.Dispatcher.IntegrationEvents.Tests.Events;
+global using Masa.Contrib.Dispatcher.IntegrationEvents.Tests.Infrastructure;
 global using Masa.Utils.Models.Config;
 global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.DependencyInjection.Extensions;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Logging.Abstractions;
 global using Microsoft.Extensions.Options;