TeamInklings/OctobotStealth
TeamInklings/OctobotStealth
Archived
1
0
Fork 0
forked from TeamInklings/Octobot
Code Pull requests Wiki Activity Actions

Merge BackgroundGuildDataSaverService into GuildDataService (#239)

Browse source 
Title. idk why I didn't think of this before.
Also, GuildDataService is now properly registered as an IHostedService,
so it receives start & shutdown events. So this PR gets rid of the
workaround that was needed for save-on-shutdown to function

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2023-12-20 22:08:56 +05:00 • committed by GitHub
parent bd4c5b26da
commit 21f200c988
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Services/BackgroundGuildDataSaverService.cs
View file

@ -1,23 +0,0 @@
using Microsoft.Extensions.Hosting;
namespace Octobot.Services;
public sealed class BackgroundGuildDataSaverService : BackgroundService
{
private readonly GuildDataService _guildData;
public BackgroundGuildDataSaverService(GuildDataService guildData)
{
_guildData = guildData;
}
protected override async Task ExecuteAsync(CancellationToken ct)
{
using var timer = new PeriodicTimer(TimeSpan.FromMinutes(5));
while (await timer.WaitForNextTickAsync(ct))
{
await _guildData.SaveAsync(ct);
}
}
}

24
src/Services/GuildDataService.cs
View file

@ -11,25 +11,23 @@ namespace Octobot.Services;
/// <summary>
/// Handles saving, loading, initializing and providing <see cref="GuildData" />.
/// </summary>
public sealed class GuildDataService
public sealed class GuildDataService : BackgroundService
{
private readonly ConcurrentDictionary<Snowflake, GuildData> _datas = new();
private readonly ILogger<GuildDataService> _logger;
// https://github.com/dotnet/aspnetcore/issues/39139
public GuildDataService(
IHostApplicationLifetime lifetime, ILogger<GuildDataService> logger)
public GuildDataService(ILogger<GuildDataService> logger)
{
_logger = logger;
lifetime.ApplicationStopping.Register(ApplicationStopping);
}
private void ApplicationStopping()
public override Task StopAsync(CancellationToken ct)
{
SaveAsync(CancellationToken.None).GetAwaiter().GetResult();
base.StopAsync(ct);
return SaveAsync(ct);
}
public Task SaveAsync(CancellationToken ct)
private Task SaveAsync(CancellationToken ct)
{
var tasks = new List<Task>();
var datas = _datas.Values.ToArray();
@ -58,6 +56,16 @@ public sealed class GuildDataService
File.Delete(tempFilePath);
}
protected override async Task ExecuteAsync(CancellationToken ct)
{
using var timer = new PeriodicTimer(TimeSpan.FromMinutes(5));
while (await timer.WaitForNextTickAsync(ct))
{
await SaveAsync(ct);
}
}
public async Task<GuildData> GetData(Snowflake guildId, CancellationToken ct = default)
{
return _datas.TryGetValue(guildId, out var data) ? data : await InitializeData(guildId, ct);