Browse Source
Use `AsyncHelper` to call the async method.
pull/11078/head
maliming
4 years ago
No known key found for this signature in database
GPG Key ID: 96224957E51C89E
8 changed files with
11 additions and
65 deletions
-
framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpBackgroundJobsRabbitMqModule.cs
-
framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs
-
framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs
-
framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs
-
framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs
-
framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs
-
modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs
-
modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
|
|
|
@ -30,12 +30,12 @@ public class AbpBackgroundJobsRabbitMqModule : AbpModule |
|
|
|
|
|
|
|
public override void OnApplicationInitialization(ApplicationInitializationContext context) |
|
|
|
{ |
|
|
|
AsyncHelper.RunSync(() => StartJobQueueManagerAsync(context)); |
|
|
|
AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); |
|
|
|
} |
|
|
|
|
|
|
|
public override void OnApplicationShutdown(ApplicationShutdownContext context) |
|
|
|
{ |
|
|
|
AsyncHelper.RunSync(() => StopJobQueueManagerAsync(context)); |
|
|
|
AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context)); |
|
|
|
} |
|
|
|
|
|
|
|
private async static Task StartJobQueueManagerAsync(ApplicationInitializationContext context) |
|
|
|
|
|
|
|
@ -30,10 +30,6 @@ public class AbpBackgroundJobsModule : AbpModule |
|
|
|
|
|
|
|
public override void OnApplicationInitialization(ApplicationInitializationContext context) |
|
|
|
{ |
|
|
|
var options = context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundJobOptions>>().Value; |
|
|
|
if (options.IsJobExecutionEnabled) |
|
|
|
{ |
|
|
|
AsyncHelper.RunSync(() => context.AddBackgroundWorkerAsync<IBackgroundJobWorker>()); |
|
|
|
} |
|
|
|
AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -52,16 +52,6 @@ public class AbpBackgroundWorkersQuartzModule : AbpModule |
|
|
|
|
|
|
|
public override void OnApplicationInitialization(ApplicationInitializationContext context) |
|
|
|
{ |
|
|
|
var quartzBackgroundWorkerOptions = context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundWorkerQuartzOptions>>().Value; |
|
|
|
if (quartzBackgroundWorkerOptions.IsAutoRegisterEnabled) |
|
|
|
{ |
|
|
|
var backgroundWorkerManager = context.ServiceProvider.GetRequiredService<IBackgroundWorkerManager>(); |
|
|
|
var works = context.ServiceProvider.GetServices<IQuartzBackgroundWorker>().Where(x => x.AutoRegister); |
|
|
|
|
|
|
|
foreach (var work in works) |
|
|
|
{ |
|
|
|
AsyncHelper.RunSync(() => backgroundWorkerManager.AddAsync(work)); |
|
|
|
} |
|
|
|
} |
|
|
|
AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -35,27 +35,11 @@ public class AbpBackgroundWorkersModule : AbpModule |
|
|
|
|
|
|
|
public override void OnApplicationInitialization(ApplicationInitializationContext context) |
|
|
|
{ |
|
|
|
var options = context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundWorkerOptions>>().Value; |
|
|
|
if (options.IsEnabled) |
|
|
|
{ |
|
|
|
AsyncHelper.RunSync( |
|
|
|
() => context.ServiceProvider |
|
|
|
.GetRequiredService<IBackgroundWorkerManager>() |
|
|
|
.StartAsync() |
|
|
|
); |
|
|
|
} |
|
|
|
AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); |
|
|
|
} |
|
|
|
|
|
|
|
public override void OnApplicationShutdown(ApplicationShutdownContext context) |
|
|
|
{ |
|
|
|
var options = context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundWorkerOptions>>().Value; |
|
|
|
if (options.IsEnabled) |
|
|
|
{ |
|
|
|
AsyncHelper.RunSync( |
|
|
|
() => context.ServiceProvider |
|
|
|
.GetRequiredService<IBackgroundWorkerManager>() |
|
|
|
.StopAsync() |
|
|
|
); |
|
|
|
} |
|
|
|
AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -40,8 +40,7 @@ public class AbpEventBusModule : AbpModule |
|
|
|
|
|
|
|
public override void OnApplicationInitialization(ApplicationInitializationContext context) |
|
|
|
{ |
|
|
|
AsyncHelper.RunSync(() => context.AddBackgroundWorkerAsync<OutboxSenderManager>()); |
|
|
|
AsyncHelper.RunSync(() => context.AddBackgroundWorkerAsync<InboxProcessManager>()); |
|
|
|
AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); |
|
|
|
} |
|
|
|
|
|
|
|
private static void AddEventHandlers(IServiceCollection services) |
|
|
|
|
|
|
|
@ -81,18 +81,11 @@ public class AbpQuartzModule : AbpModule |
|
|
|
|
|
|
|
public override void OnApplicationInitialization(ApplicationInitializationContext context) |
|
|
|
{ |
|
|
|
var options = context.ServiceProvider.GetRequiredService<IOptions<AbpQuartzOptions>>().Value; |
|
|
|
|
|
|
|
_scheduler = context.ServiceProvider.GetRequiredService<IScheduler>(); |
|
|
|
|
|
|
|
AsyncHelper.RunSync(() => options.StartSchedulerFactory.Invoke(_scheduler)); |
|
|
|
AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); |
|
|
|
} |
|
|
|
|
|
|
|
public override void OnApplicationShutdown(ApplicationShutdownContext context) |
|
|
|
{ |
|
|
|
if (_scheduler.IsStarted) |
|
|
|
{ |
|
|
|
AsyncHelper.RunSync(() => _scheduler.Shutdown()); |
|
|
|
} |
|
|
|
AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -80,14 +80,7 @@ namespace Volo.Docs |
|
|
|
|
|
|
|
public override void OnApplicationInitialization(ApplicationInitializationContext context) |
|
|
|
{ |
|
|
|
using (var scope = context.ServiceProvider.CreateScope()) |
|
|
|
{ |
|
|
|
if (scope.ServiceProvider.GetRequiredService<IOptions<DocsElasticSearchOptions>>().Value.Enable) |
|
|
|
{ |
|
|
|
var documentFullSearch = scope.ServiceProvider.GetRequiredService<IDocumentFullSearch>(); |
|
|
|
AsyncHelper.RunSync(() => documentFullSearch.CreateIndexIfNeededAsync()); |
|
|
|
} |
|
|
|
} |
|
|
|
AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -150,15 +150,6 @@ public class AbpIdentityServerDomainModule : AbpModule |
|
|
|
|
|
|
|
public override void OnApplicationInitialization(ApplicationInitializationContext context) |
|
|
|
{ |
|
|
|
var options = context.ServiceProvider.GetRequiredService<IOptions<TokenCleanupOptions>>().Value; |
|
|
|
if (options.IsCleanupEnabled) |
|
|
|
{ |
|
|
|
AsyncHelper.RunSync(() => context.ServiceProvider |
|
|
|
.GetRequiredService<IBackgroundWorkerManager>() |
|
|
|
.AddAsync( |
|
|
|
context.ServiceProvider |
|
|
|
.GetRequiredService<TokenCleanupBackgroundWorker>() |
|
|
|
)); |
|
|
|
} |
|
|
|
AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context)); |
|
|
|
} |
|
|
|
} |
|
|
|
|