aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-23 07:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Periodic tasks would sometimes stop firing (#6898)

Browse Source
This commit is contained in:
Nicolas Dorier
2025-08-25 02:37:16 +01:00
committed by GitHub
parent 769cbd2bb6
commit fe09dca178
6 changed files with 63 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer.Tests/docker-compose.altcoins.yml
View File

@@ -99,7 +99,7 @@ services:
custom:
nbxplorer:
image: nicolasdorier/nbxplorer:2.5.28
image: nicolasdorier/nbxplorer:2.5.29
restart: unless-stopped
ports:
- "32838:32838"

2
BTCPayServer.Tests/docker-compose.mutinynet.yml
View File

@@ -62,7 +62,7 @@ services:
custom:
nbxplorer:
image: nicolasdorier/nbxplorer:2.5.28
image: nicolasdorier/nbxplorer:2.5.29
restart: unless-stopped
ports:
- "32838:32838"

2
BTCPayServer.Tests/docker-compose.testnet.yml
View File

@@ -57,7 +57,7 @@ services:
custom:
nbxplorer:
image: nicolasdorier/nbxplorer:2.5.28
image: nicolasdorier/nbxplorer:2.5.29
restart: unless-stopped
ports:
- "32838:32838"

2
BTCPayServer.Tests/docker-compose.yml
View File

@@ -95,7 +95,7 @@ services:
custom:
nbxplorer:
image: nicolasdorier/nbxplorer:2.5.28
image: nicolasdorier/nbxplorer:2.5.29
restart: unless-stopped
ports:
- "32838:32838"

121
BTCPayServer/HostedServices/PeriodicTaskLauncherHostedService.cs
View File

@@ -7,86 +7,83 @@ using System.Threading;
using System.Threading.Channels;
using System.Threading.Tasks;
namespace BTCPayServer.HostedServices
namespace BTCPayServer.HostedServices;
public class PeriodicTaskLauncherHostedService : IHostedService
{
public class PeriodicTaskLauncherHostedService : IHostedService
public PeriodicTaskLauncherHostedService(IServiceProvider serviceProvider, ILoggerFactory loggerFactory)
{
public PeriodicTaskLauncherHostedService(IServiceProvider serviceProvider, ILoggerFactory loggerFactory)
{
ServiceProvider = serviceProvider;
Logger = loggerFactory.CreateLogger("BTCPayServer.PeriodicTasks");
}
ServiceProvider = serviceProvider;
Logger = loggerFactory.CreateLogger("BTCPayServer.PeriodicTasks");
}
public IServiceProvider ServiceProvider { get; }
public ILogger Logger { get; }
public IServiceProvider ServiceProvider { get; }
public ILogger Logger { get; }
Channel<ScheduledTask> jobs = Channel.CreateBounded<ScheduledTask>(100);
CancellationTokenSource cts;
public Task StartAsync(CancellationToken cancellationToken)
{
cts = new CancellationTokenSource();
foreach (var task in ServiceProvider.GetServices<ScheduledTask>())
jobs.Writer.TryWrite(task);
Channel<ScheduledTask> jobs = Channel.CreateBounded<ScheduledTask>(100);
CancellationTokenSource cts;
loop = Task.WhenAll(Enumerable.Range(0, 3).Select(_ => Loop(cts.Token)).ToArray());
return Task.CompletedTask;
}
Task loop;
private async Task Loop(CancellationToken token)
public Task StartAsync(CancellationToken cancellationToken)
{
cts = new CancellationTokenSource();
foreach (var task in ServiceProvider.GetServices<ScheduledTask>())
jobs.Writer.TryWrite(task);
loop = Task.WhenAll(Enumerable.Range(0, 3).Select(_ => Loop(cts.Token)).ToArray());
return Task.CompletedTask;
}
Task loop;
private async Task Loop(CancellationToken token)
{
try
{
try
await foreach (var job in jobs.Reader.ReadAllAsync(token))
{
await foreach (var job in jobs.Reader.ReadAllAsync(token))
var t = (IPeriodicTask)ServiceProvider.GetService(job.PeriodicTaskType);
try
{
if (job.NextScheduled <= DateTimeOffset.UtcNow)
{
var t = (IPeriodicTask)ServiceProvider.GetService(job.PeriodicTaskType);
try
{
await t.Do(token);
}
catch when (token.IsCancellationRequested)
{
throw;
}
catch (Exception ex)
{
Logger.LogError(ex, $"Unhandled error in periodic task {job.PeriodicTaskType.Name}");
}
finally
{
job.NextScheduled = DateTimeOffset.UtcNow + job.Every;
}
}
_ = Wait(job, token);
await t.Do(token);
}
}
catch when (token.IsCancellationRequested)
{
catch when (token.IsCancellationRequested)
{
throw;
}
catch (Exception ex)
{
Logger.LogError(ex, $"Unhandled error in periodic task {job.PeriodicTaskType.Name}");
}
_ = Wait(job, token);
}
}
private async Task Wait(ScheduledTask job, CancellationToken token)
catch when (token.IsCancellationRequested)
{
var timeToWait = job.NextScheduled - DateTimeOffset.UtcNow;
try
{
await Task.Delay(timeToWait, token);
}
catch { }
while (await jobs.Writer.WaitToWriteAsync())
}
}
private async Task Wait(ScheduledTask job, CancellationToken token)
{
try
{
await Task.Delay(job.Every, token);
while (await jobs.Writer.WaitToWriteAsync(token))
{
if (jobs.Writer.TryWrite(job))
break;
}
}
public async Task StopAsync(CancellationToken cancellationToken)
catch when (token.IsCancellationRequested)
{
cts?.Cancel();
jobs.Writer.TryComplete();
if (loop is not null)
await loop;
}
}
public async Task StopAsync(CancellationToken cancellationToken)
{
cts?.Cancel();
jobs.Writer.TryComplete();
if (loop is not null)
await loop;
}
}

1
BTCPayServer/HostedServices/ScheduledTask.cs
View File

@@ -11,6 +11,5 @@ namespace BTCPayServer.HostedServices
}
public Type PeriodicTaskType { get; set; }
public TimeSpan Every { get; set; } = TimeSpan.FromMinutes(5.0);
public DateTimeOffset NextScheduled { get; set; } = DateTimeOffset.UtcNow;
}
}