Browse Source

Use `AsyncHelper` to call the async method.

pull/11078/head
maliming 5 years ago
parent
commit
d4ffac7913
No known key found for this signature in database GPG Key ID: 96224957E51C89E
  1. 4
      framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpBackgroundJobsRabbitMqModule.cs
  2. 6
      framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs
  3. 12
      framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs
  4. 20
      framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs
  5. 3
      framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs
  6. 11
      framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs
  7. 9
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs
  8. 11
      modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs

4
framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpBackgroundJobsRabbitMqModule.cs

@ -30,12 +30,12 @@ public class AbpBackgroundJobsRabbitMqModule : AbpModule
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)
{ {
AsyncHelper.RunSync(() => StartJobQueueManagerAsync(context)); AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
} }
public override void OnApplicationShutdown(ApplicationShutdownContext context) public override void OnApplicationShutdown(ApplicationShutdownContext context)
{ {
AsyncHelper.RunSync(() => StopJobQueueManagerAsync(context)); AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context));
} }
private async static Task StartJobQueueManagerAsync(ApplicationInitializationContext context) private async static Task StartJobQueueManagerAsync(ApplicationInitializationContext context)

6
framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs

@ -30,10 +30,6 @@ public class AbpBackgroundJobsModule : AbpModule
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)
{ {
var options = context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundJobOptions>>().Value; AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
if (options.IsJobExecutionEnabled)
{
AsyncHelper.RunSync(() => context.AddBackgroundWorkerAsync<IBackgroundJobWorker>());
}
} }
} }

12
framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs

@ -52,16 +52,6 @@ public class AbpBackgroundWorkersQuartzModule : AbpModule
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)
{ {
var quartzBackgroundWorkerOptions = context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundWorkerQuartzOptions>>().Value; AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
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));
}
}
} }
} }

20
framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs

@ -35,27 +35,11 @@ public class AbpBackgroundWorkersModule : AbpModule
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)
{ {
var options = context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundWorkerOptions>>().Value; AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
if (options.IsEnabled)
{
AsyncHelper.RunSync(
() => context.ServiceProvider
.GetRequiredService<IBackgroundWorkerManager>()
.StartAsync()
);
}
} }
public override void OnApplicationShutdown(ApplicationShutdownContext context) public override void OnApplicationShutdown(ApplicationShutdownContext context)
{ {
var options = context.ServiceProvider.GetRequiredService<IOptions<AbpBackgroundWorkerOptions>>().Value; AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context));
if (options.IsEnabled)
{
AsyncHelper.RunSync(
() => context.ServiceProvider
.GetRequiredService<IBackgroundWorkerManager>()
.StopAsync()
);
}
} }
} }

3
framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs

@ -40,8 +40,7 @@ public class AbpEventBusModule : AbpModule
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)
{ {
AsyncHelper.RunSync(() => context.AddBackgroundWorkerAsync<OutboxSenderManager>()); AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
AsyncHelper.RunSync(() => context.AddBackgroundWorkerAsync<InboxProcessManager>());
} }
private static void AddEventHandlers(IServiceCollection services) private static void AddEventHandlers(IServiceCollection services)

11
framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs

@ -81,18 +81,11 @@ public class AbpQuartzModule : AbpModule
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)
{ {
var options = context.ServiceProvider.GetRequiredService<IOptions<AbpQuartzOptions>>().Value; AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
_scheduler = context.ServiceProvider.GetRequiredService<IScheduler>();
AsyncHelper.RunSync(() => options.StartSchedulerFactory.Invoke(_scheduler));
} }
public override void OnApplicationShutdown(ApplicationShutdownContext context) public override void OnApplicationShutdown(ApplicationShutdownContext context)
{ {
if (_scheduler.IsStarted) AsyncHelper.RunSync(() => OnApplicationShutdownAsync(context));
{
AsyncHelper.RunSync(() => _scheduler.Shutdown());
}
} }
} }

9
modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs

@ -80,14 +80,7 @@ namespace Volo.Docs
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)
{ {
using (var scope = context.ServiceProvider.CreateScope()) AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
{
if (scope.ServiceProvider.GetRequiredService<IOptions<DocsElasticSearchOptions>>().Value.Enable)
{
var documentFullSearch = scope.ServiceProvider.GetRequiredService<IDocumentFullSearch>();
AsyncHelper.RunSync(() => documentFullSearch.CreateIndexIfNeededAsync());
}
}
} }
} }
} }

11
modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs

@ -150,15 +150,6 @@ public class AbpIdentityServerDomainModule : AbpModule
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)
{ {
var options = context.ServiceProvider.GetRequiredService<IOptions<TokenCleanupOptions>>().Value; AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
if (options.IsCleanupEnabled)
{
AsyncHelper.RunSync(() => context.ServiceProvider
.GetRequiredService<IBackgroundWorkerManager>()
.AddAsync(
context.ServiceProvider
.GetRequiredService<TokenCleanupBackgroundWorker>()
));
}
} }
} }

Loading…
Cancel
Save