From a42b06133004c6c49cd1e33dfaf656ab69ffc28b Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 14 Dec 2023 11:35:13 +0800 Subject: [PATCH] Add Initialize to HangfireBackgroundWorkerManager --- .../Hangfire/AbpBackgroundWorkersHangfireModule.cs | 13 ++++--------- .../Hangfire/HangfireBackgroundWorkerManager.cs | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs index afe9a90a8a..5bfe6aad7c 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/AbpBackgroundWorkersHangfireModule.cs @@ -19,7 +19,7 @@ public class AbpBackgroundWorkersHangfireModule : AbpModule context.Services.AddSingleton(typeof(HangfirePeriodicBackgroundWorkerAdapter<>)); } - public async override Task OnPreApplicationInitializationAsync(ApplicationInitializationContext context) + public override void OnPreApplicationInitialization(ApplicationInitializationContext context) { var options = context.ServiceProvider.GetRequiredService>().Value; if (!options.IsEnabled) @@ -28,14 +28,9 @@ public class AbpBackgroundWorkersHangfireModule : AbpModule hangfireOptions.BackgroundJobServerFactory = CreateOnlyEnqueueJobServer; } - await context.ServiceProvider - .GetRequiredService() - .StartAsync(); - } - - public override void OnPreApplicationInitialization(ApplicationInitializationContext context) - { - AsyncHelper.RunSync(() => OnPreApplicationInitializationAsync(context)); + context.ServiceProvider + .GetRequiredService() + .Initialize(); } private BackgroundJobServer? CreateOnlyEnqueueJobServer(IServiceProvider serviceProvider) diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs index 4b6582d03d..d37583a119 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers.Hangfire/Volo/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerManager.cs @@ -12,6 +12,7 @@ using Volo.Abp.Threading; namespace Volo.Abp.BackgroundWorkers.Hangfire; [Dependency(ReplaceServices = true)] +[ExposeServices(typeof(IBackgroundWorkerManager), typeof(HangfireBackgroundWorkerManager))] public class HangfireBackgroundWorkerManager : BackgroundWorkerManager, ISingletonDependency { protected AbpHangfireBackgroundJobServer BackgroundJobServer { get; set; } = default!; @@ -22,10 +23,9 @@ public class HangfireBackgroundWorkerManager : BackgroundWorkerManager, ISinglet ServiceProvider = serviceProvider; } - public async override Task StartAsync(CancellationToken cancellationToken = default) + public void Initialize() { BackgroundJobServer = ServiceProvider.GetRequiredService(); - await base.StartAsync(cancellationToken); } public async override Task AddAsync(IBackgroundWorker worker, CancellationToken cancellationToken = default)