Browse Source

Code formatting

pull/2904/head
liangshiwei 6 years ago
parent
commit
595a44fa94
  1. 2
      framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzBackgroundJobManager.cs
  2. 3
      framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzJobExecutionAdapter.cs
  3. 2
      framework/src/Volo.Abp.BackgroundWorkers.Quartz/FodyWeavers.xml
  4. 5
      framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs
  5. 2
      framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerBase.cs
  6. 5
      framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerManager.cs
  7. 16
      framework/src/Volo.Abp.Quartz/Microsoft/Extensions/DependencyInjection/AbpQuartzServiceCollectionExtensions.cs
  8. 1
      framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzJobFactory.cs
  9. 6
      framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs
  10. 1
      framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzPreOptions.cs

2
framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzBackgroundJobManager.cs

@ -20,9 +20,7 @@ namespace Volo.Abp.BackgroundJobs.Quartz
{
var jobDetail = JobBuilder.Create<QuartzJobExecutionAdapter<TArgs>>().SetJobData(new JobDataMap { { nameof(TArgs), args } }).Build();
var trigger = !delay.HasValue ? TriggerBuilder.Create().StartNow().Build() : TriggerBuilder.Create().StartAt(new DateTimeOffset(DateTime.Now.Add(delay.Value))).Build();
await _scheduler.ScheduleJob(jobDetail, trigger);
return jobDetail.Key.ToString();
}
}

3
framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzJobExecutionAdapter.cs

@ -11,7 +11,7 @@ namespace Volo.Abp.BackgroundJobs.Quartz
protected AbpBackgroundJobOptions Options { get; }
protected IServiceScopeFactory ServiceScopeFactory { get; }
protected IBackgroundJobExecuter JobExecuter { get; }
public QuartzJobExecutionAdapter(
IOptions<AbpBackgroundJobOptions> options,
IBackgroundJobExecuter jobExecuter,
@ -22,7 +22,6 @@ namespace Volo.Abp.BackgroundJobs.Quartz
Options = options.Value;
}
public async Task Execute(IJobExecutionContext context)
{
using (var scope = ServiceScopeFactory.CreateScope())

2
framework/src/Volo.Abp.BackgroundWorkers.Quartz/FodyWeavers.xml

@ -1,3 +1,3 @@
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<ConfigureAwait />
<ConfigureAwait ContinueOnCapturedContext="false" />
</Weavers>

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

@ -14,12 +14,9 @@ namespace Volo.Abp.BackgroundWorkers.Quartz
public override void PreConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddConventionalRegistrar(new AbpQuartzConventionalRegistrar());
context.Services.Replace(ServiceDescriptor
.Transient<IBackgroundWorkerManager, QuartzBackgroundWorkerManager>());
context.Services.Replace(ServiceDescriptor.Transient<IBackgroundWorkerManager, QuartzBackgroundWorkerManager>());
}
public override void OnApplicationInitialization(ApplicationInitializationContext context)
{
using (var scope = context.ServiceProvider.CreateScope())

2
framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerBase.cs

@ -7,8 +7,6 @@ namespace Volo.Abp.BackgroundWorkers.Quartz
{
public ITrigger Trigger { get; set; }
public IJobDetail JobDetail { get; set; }
public abstract Task Execute(IJobExecutionContext context);
}

5
framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerManager.cs

@ -1,5 +1,4 @@
using System;
using System.Threading;
using System.Threading;
using System.Threading.Tasks;
using Quartz;
using Volo.Abp.DependencyInjection;
@ -27,7 +26,6 @@ namespace Volo.Abp.BackgroundWorkers.Quartz
{
await _scheduler.PauseAll(cancellationToken);
}
}
public void Add(IBackgroundWorker worker)
@ -40,6 +38,5 @@ namespace Volo.Abp.BackgroundWorkers.Quartz
AsyncHelper.RunSync(() => _scheduler.ScheduleJob(quartzWork.JobDetail, quartzWork.Trigger));
}
}
}
}

16
framework/src/Volo.Abp.Quartz/Microsoft/Extensions/DependencyInjection/AbpQuartzServiceCollectionExtensions.cs

@ -1,16 +0,0 @@
using Quartz.Impl;
using Quartz.Spi;
using Volo.Abp.Quartz;
using Volo.Abp.Threading;
namespace Microsoft.Extensions.DependencyInjection
{
public static class AbpQuartzServiceCollectionExtensions
{
public static IServiceCollection AddQuartz(this IServiceCollection services, AbpQuartzPreOptions options)
{
services.AddSingleton(AsyncHelper.RunSync(() => new StdSchedulerFactory(options.Properties).GetScheduler()));
return services.AddSingleton(typeof(IJobFactory), typeof(AbpQuartzJobFactory));
}
}
}

1
framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzJobFactory.cs

@ -8,6 +8,7 @@ namespace Volo.Abp.Quartz
public class AbpQuartzJobFactory : IJobFactory
{
private readonly IServiceProvider _serviceProvider;
public AbpQuartzJobFactory(IServiceProvider serviceProvider)
{
_serviceProvider = serviceProvider;

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

@ -1,19 +1,21 @@
using Microsoft.Extensions.DependencyInjection;
using Quartz;
using Quartz.Impl;
using Quartz.Spi;
using Volo.Abp.Modularity;
using Volo.Abp.Threading;
namespace Volo.Abp.Quartz
{
public class AbpQuartzModule : AbpModule
{
private IScheduler _scheduler;
public override void ConfigureServices(ServiceConfigurationContext context)
{
var options = context.Services.ExecutePreConfiguredActions<AbpQuartzPreOptions>();
context.Services.AddQuartz(options);
context.Services.AddSingleton(AsyncHelper.RunSync(() => new StdSchedulerFactory(options.Properties).GetScheduler()));
context.Services.AddSingleton(typeof(IJobFactory), typeof(AbpQuartzJobFactory));
}
public override void OnApplicationInitialization(ApplicationInitializationContext context)

1
framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzPreOptions.cs

@ -1,5 +1,4 @@
using System.Collections.Specialized;
using JetBrains.Annotations;
namespace Volo.Abp.Quartz
{

Loading…
Cancel
Save