Ensure `RunStartupTasks` is added before background and recurring tasks as order is critical for correct startup and tenant activation behavior. This prevents potential misalignment in task execution during tenant lifecycle events. Fixes #6269
62 lines
2.6 KiB
C#
62 lines
2.6 KiB
C#
using Elsa.Common.Multitenancy;
|
|
using Elsa.Common.Multitenancy.EventHandlers;
|
|
using Elsa.Common.Multitenancy.HostedServices;
|
|
using Elsa.Common.RecurringTasks;
|
|
using Elsa.Features.Abstractions;
|
|
using Elsa.Features.Services;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.DependencyInjection.Extensions;
|
|
|
|
namespace Elsa.Common.Features;
|
|
|
|
public class MultitenancyFeature(IModule module) : FeatureBase(module)
|
|
{
|
|
private Func<IServiceProvider, ITenantsProvider> _tenantsProviderFactory = sp => sp.GetRequiredService<DefaultTenantsProvider>();
|
|
|
|
public MultitenancyFeature UseTenantsProvider<TTenantsProvider>() where TTenantsProvider : class, ITenantsProvider
|
|
{
|
|
Services.TryAddScoped<TTenantsProvider>();
|
|
return UseTenantsProvider(sp => sp.GetRequiredService<TTenantsProvider>());
|
|
}
|
|
|
|
public MultitenancyFeature UseTenantsProvider(Func<IServiceProvider, ITenantsProvider> tenantsProviderFactory)
|
|
{
|
|
_tenantsProviderFactory = tenantsProviderFactory;
|
|
return this;
|
|
}
|
|
|
|
public override void ConfigureHostedServices()
|
|
{
|
|
Module
|
|
.ConfigureHostedService<ActivateTenants>(-1)
|
|
;
|
|
}
|
|
|
|
public override void Apply()
|
|
{
|
|
Services
|
|
.AddSingleton<ITenantScopeFactory, DefaultTenantScopeFactory>()
|
|
.AddSingleton<ITenantAccessor, DefaultTenantAccessor>()
|
|
.AddSingleton<ITenantFinder, DefaultTenantFinder>()
|
|
.AddSingleton<ITenantService, DefaultTenantService>()
|
|
|
|
// Order is important: Startup task first, then background and recurring tasks.
|
|
.AddSingleton<ITenantActivatedEvent, RunStartupTasks>()
|
|
|
|
.AddSingleton<RunBackgroundTasks>()
|
|
.AddSingleton<ITenantActivatedEvent>(sp => sp.GetRequiredService<RunBackgroundTasks>())
|
|
.AddSingleton<ITenantDeactivatedEvent>(sp => sp.GetRequiredService<RunBackgroundTasks>())
|
|
|
|
.AddSingleton<StartRecurringTasks>()
|
|
.AddSingleton<ITenantActivatedEvent>(sp => sp.GetRequiredService<StartRecurringTasks>())
|
|
.AddSingleton<ITenantDeactivatedEvent>(sp => sp.GetRequiredService<StartRecurringTasks>())
|
|
|
|
.AddSingleton<RecurringTaskScheduleManager>()
|
|
.AddSingleton<TenantEventsManager>()
|
|
.AddScoped<DefaultTenantsProvider>()
|
|
.AddScoped<DefaultTenantResolver>()
|
|
.AddScoped<ITaskExecutor, TaskExecutor>()
|
|
.AddScoped<IBackgroundTaskStarter, TaskExecutor>()
|
|
.AddScoped(_tenantsProviderFactory);
|
|
}
|
|
} |