diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs index 21bd522145..71bdb20707 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs @@ -65,6 +65,11 @@ public class AbpFeatureManagementDomainModule : AbpModule await initializer.InitializeAsync(true, _cancellationTokenSource.Token); } + public override void OnApplicationShutdown(ApplicationShutdownContext context) + { + AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context)); + } + public override Task OnApplicationShutdownAsync(ApplicationShutdownContext context) { _cancellationTokenSource.Cancel(); diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule_Shutdown_Tests.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule_Shutdown_Tests.cs new file mode 100644 index 0000000000..ce02c49f60 --- /dev/null +++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.Domain.Tests/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule_Shutdown_Tests.cs @@ -0,0 +1,74 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Shouldly; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Modularity; +using Xunit; + +namespace Volo.Abp.FeatureManagement; + +public class AbpFeatureManagementDomainModule_Shutdown_Tests +{ + [Fact] + public async Task Shutdown_Should_Cancel_The_Dynamic_Initialization() + { + using var application = await AbpApplicationFactory.CreateAsync(options => options.UseAutofac()); + await application.InitializeAsync(); + var token = application.ServiceProvider.GetRequiredService().Token; + token.IsCancellationRequested.ShouldBeFalse(); + + application.Shutdown(); + + token.IsCancellationRequested.ShouldBeTrue(); + } + + [Fact] + public async Task ShutdownAsync_Should_Cancel_The_Dynamic_Initialization() + { + using var application = await AbpApplicationFactory.CreateAsync(options => options.UseAutofac()); + await application.InitializeAsync(); + var token = application.ServiceProvider.GetRequiredService().Token; + + await application.ShutdownAsync(); + + token.IsCancellationRequested.ShouldBeTrue(); + } + + public class InitializationTokenRecorder + { + public CancellationToken Token { get; set; } + } + + [DisableConventionalRegistration] + public class RecordingFeatureDynamicInitializer : FeatureDynamicInitializer + { + public RecordingFeatureDynamicInitializer(IServiceProvider serviceProvider) + : base(serviceProvider) + { + } + + public override Task InitializeAsync(bool runInBackground, CancellationToken cancellationToken = default) + { + // The module starts it in the background; a test module may run it again in the foreground without a token. + if (runInBackground) + { + ServiceProvider.GetRequiredService().Token = cancellationToken; + } + + return Task.CompletedTask; + } + } + + [DependsOn(typeof(AbpFeatureManagementDomainTestModule))] + public class ShutdownTestModule : AbpModule + { + public override void ConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddSingleton(); + context.Services.Replace(ServiceDescriptor.Transient()); + } + } +} diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs index 2f65a89994..952520b842 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs @@ -55,6 +55,11 @@ public class AbpPermissionManagementDomainModule : AbpModule } } + public override void OnApplicationShutdown(ApplicationShutdownContext context) + { + AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context)); + } + public override Task OnApplicationShutdownAsync(ApplicationShutdownContext context) { _cancellationTokenSource.Cancel(); diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule_Shutdown_Tests.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule_Shutdown_Tests.cs new file mode 100644 index 0000000000..028f6c3348 --- /dev/null +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule_Shutdown_Tests.cs @@ -0,0 +1,74 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Shouldly; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Modularity; +using Xunit; + +namespace Volo.Abp.PermissionManagement; + +public class AbpPermissionManagementDomainModule_Shutdown_Tests +{ + [Fact] + public async Task Shutdown_Should_Cancel_The_Dynamic_Initialization() + { + using var application = await AbpApplicationFactory.CreateAsync(options => options.UseAutofac()); + await application.InitializeAsync(); + var token = application.ServiceProvider.GetRequiredService().Token; + token.IsCancellationRequested.ShouldBeFalse(); + + application.Shutdown(); + + token.IsCancellationRequested.ShouldBeTrue(); + } + + [Fact] + public async Task ShutdownAsync_Should_Cancel_The_Dynamic_Initialization() + { + using var application = await AbpApplicationFactory.CreateAsync(options => options.UseAutofac()); + await application.InitializeAsync(); + var token = application.ServiceProvider.GetRequiredService().Token; + + await application.ShutdownAsync(); + + token.IsCancellationRequested.ShouldBeTrue(); + } + + public class InitializationTokenRecorder + { + public CancellationToken Token { get; set; } + } + + [DisableConventionalRegistration] + public class RecordingPermissionDynamicInitializer : PermissionDynamicInitializer + { + public RecordingPermissionDynamicInitializer(IServiceProvider serviceProvider) + : base(serviceProvider) + { + } + + public override Task InitializeAsync(bool runInBackground, CancellationToken cancellationToken = default) + { + // The module starts it in the background; a test module may run it again in the foreground without a token. + if (runInBackground) + { + ServiceProvider.GetRequiredService().Token = cancellationToken; + } + + return Task.CompletedTask; + } + } + + [DependsOn(typeof(AbpPermissionManagementTestModule))] + public class ShutdownTestModule : AbpModule + { + public override void ConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddSingleton(); + context.Services.Replace(ServiceDescriptor.Transient()); + } + } +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs index 84e7a24e8a..67a6b02e81 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule.cs @@ -58,6 +58,11 @@ public class AbpSettingManagementDomainModule : AbpModule await initializer.InitializeAsync(true, _cancellationTokenSource.Token); } + public override void OnApplicationShutdown(ApplicationShutdownContext context) + { + AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context)); + } + public override Task OnApplicationShutdownAsync(ApplicationShutdownContext context) { _cancellationTokenSource.Cancel(); diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule_Shutdown_Tests.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule_Shutdown_Tests.cs new file mode 100644 index 0000000000..1ea1084805 --- /dev/null +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/AbpSettingManagementDomainModule_Shutdown_Tests.cs @@ -0,0 +1,74 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Shouldly; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Modularity; +using Xunit; + +namespace Volo.Abp.SettingManagement; + +public class AbpSettingManagementDomainModule_Shutdown_Tests +{ + [Fact] + public async Task Shutdown_Should_Cancel_The_Dynamic_Initialization() + { + using var application = await AbpApplicationFactory.CreateAsync(options => options.UseAutofac()); + await application.InitializeAsync(); + var token = application.ServiceProvider.GetRequiredService().Token; + token.IsCancellationRequested.ShouldBeFalse(); + + application.Shutdown(); + + token.IsCancellationRequested.ShouldBeTrue(); + } + + [Fact] + public async Task ShutdownAsync_Should_Cancel_The_Dynamic_Initialization() + { + using var application = await AbpApplicationFactory.CreateAsync(options => options.UseAutofac()); + await application.InitializeAsync(); + var token = application.ServiceProvider.GetRequiredService().Token; + + await application.ShutdownAsync(); + + token.IsCancellationRequested.ShouldBeTrue(); + } + + public class InitializationTokenRecorder + { + public CancellationToken Token { get; set; } + } + + [DisableConventionalRegistration] + public class RecordingSettingDynamicInitializer : SettingDynamicInitializer + { + public RecordingSettingDynamicInitializer(IServiceProvider serviceProvider) + : base(serviceProvider) + { + } + + public override Task InitializeAsync(bool runInBackground, CancellationToken cancellationToken = default) + { + // The module starts it in the background; a test module may run it again in the foreground without a token. + if (runInBackground) + { + ServiceProvider.GetRequiredService().Token = cancellationToken; + } + + return Task.CompletedTask; + } + } + + [DependsOn(typeof(AbpSettingManagementTestModule))] + public class ShutdownTestModule : AbpModule + { + public override void ConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddSingleton(); + context.Services.Replace(ServiceDescriptor.Transient()); + } + } +}