SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Fix cleanup service

Browse source 
Fixes the issue where the job would run only once, instead of peridiocally.
This commit is contained in:
Sipke Schoorstra 2021-10-29 14:58:43 +02:00
parent 442ac6c6e9
commit 6ff2d69cb2
1 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/modules/retention/Elsa.Retention/HostedServices/CleanupService.cs
View file

@ -12,40 +12,27 @@ namespace Elsa.Retention.HostedServices
/// <summary>
/// Periodically wipes workflow instances and their execution logs.
/// </summary>
public class CleanupService : IHostedService, IAsyncDisposable
public class CleanupService : BackgroundService
{
private readonly IServiceScopeFactory _serviceScopeFactory;
private readonly CleanupOptions _options;
private readonly Timer _timer;
private readonly TimeSpan _interval;
public CleanupService(IOptions<CleanupOptions> options, IServiceScopeFactory serviceScopeFactory)
{
_serviceScopeFactory = serviceScopeFactory;
_options = options.Value;
_timer = new Timer(ExecuteAsync, null, Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
_interval = options.Value.SweepInterval.ToTimeSpan();
}
public Task StartAsync(CancellationToken cancellationToken)
{
_timer.Change(_options.SweepInterval.ToTimeSpan(), Timeout.InfiniteTimeSpan);
return Task.CompletedTask;
}
public Task StopAsync(CancellationToken cancellationToken)
{
_timer.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
return Task.CompletedTask;
}
public async ValueTask DisposeAsync() => await _timer.DisposeAsync();
private async void ExecuteAsync(object state)
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
using var scope = _serviceScopeFactory.CreateScope();
var job = scope.ServiceProvider.GetRequiredService<CleanupJob>();
await job.ExecuteAsync();
_timer.Change(_options.SweepInterval.ToTimeSpan(), Timeout.InfiniteTimeSpan);
while (!stoppingToken.IsCancellationRequested)
{
await Task.Delay(_interval, stoppingToken);
await job.ExecuteAsync(stoppingToken);
}
}
}
}