Noi/BirthdayBot
1
0
Fork 0
mirror of https://github.com/NoiTheCat/BirthdayBot.git synced 2024-10-16 15:59:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Retry skipped guilds after reconnection

Browse source
This commit is contained in:
Noi 2023-07-04 15:24:35 -07:00
parent ac1b4aec32
commit 21cbadb355
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
BackgroundServices/AutoUserDownload.cs
View file

@ -6,10 +6,18 @@ namespace BirthdayBot.BackgroundServices;
/// Proactively fills the user cache for guilds in which any birthday data already exists. /// Proactively fills the user cache for guilds in which any birthday data already exists.
/// </summary> /// </summary>
class AutoUserDownload : BackgroundService { class AutoUserDownload : BackgroundService {
public AutoUserDownload(ShardInstance instance) : base(instance) { } private static readonly TimeSpan RequestTimeout = ShardManager.DeadShardThreshold / 3;
private static readonly HashSet<ulong> _failedDownloads = new(); private readonly HashSet<ulong> _skippedGuilds = new();
private static readonly TimeSpan _singleDlTimeout = ShardManager.DeadShardThreshold / 3;
public AutoUserDownload(ShardInstance instance) : base(instance)
=> Shard.DiscordClient.Disconnected += OnDisconnect;
~AutoUserDownload() => Shard.DiscordClient.Disconnected -= OnDisconnect;
private Task OnDisconnect(Exception ex) {
_skippedGuilds.Clear();
return Task.CompletedTask;
}
public override async Task OnTick(int tickCount, CancellationToken token) { public override async Task OnTick(int tickCount, CancellationToken token) {
// Take action if a guild's cache is incomplete... // Take action if a guild's cache is incomplete...
@ -22,13 +30,11 @@ class AutoUserDownload : BackgroundService {
try { try {
await ConcurrentSemaphore.WaitAsync(token); await ConcurrentSemaphore.WaitAsync(token);
using var db = new BotDatabaseContext(); using var db = new BotDatabaseContext();
lock (_failedDownloads)
mustFetch = db.UserEntries.AsNoTracking() mustFetch = db.UserEntries.AsNoTracking()
.Where(e => incompleteCaches.Contains(e.GuildId)) .Where(e => incompleteCaches.Contains(e.GuildId))
.Select(e => e.GuildId) .Select(e => e.GuildId)
.Distinct() .Where(e => !_skippedGuilds.Contains(e))
.Where(e => !_failedDownloads.Contains(e)) .ToHashSet();
.ToList();
} finally { } finally {
try { try {
ConcurrentSemaphore.Release(); ConcurrentSemaphore.Release();
@ -38,27 +44,28 @@ class AutoUserDownload : BackgroundService {
var processed = 0; var processed = 0;
var processStartTime = DateTimeOffset.UtcNow; var processStartTime = DateTimeOffset.UtcNow;
foreach (var item in mustFetch) { foreach (var item in mustFetch) {
// May cause a disconnect in certain situations. Make no further attempts until the next pass if it happens. // Take break from processing to avoid getting killed by ShardManager
if (DateTimeOffset.UtcNow - processStartTime > RequestTimeout) break;
// We're useless if not connected
if (Shard.DiscordClient.ConnectionState != ConnectionState.Connected) break; if (Shard.DiscordClient.ConnectionState != ConnectionState.Connected) break;
var guild = Shard.DiscordClient.GetGuild(item); var guild = Shard.DiscordClient.GetGuild(item);
if (guild == null) continue; // A guild disappeared...? if (guild == null) continue; // A guild disappeared...?
await Task.Delay(200, CancellationToken.None); // Delay a bit (reduces the possibility of hanging, somehow).
processed++; processed++;
await Task.Delay(200, CancellationToken.None); // Delay a bit (reduces the possibility of hanging, somehow).
var dl = guild.DownloadUsersAsync(); var dl = guild.DownloadUsersAsync();
dl.Wait((int)_singleDlTimeout.TotalMilliseconds / 2, token); dl.Wait((int)RequestTimeout.TotalMilliseconds / 2, token);
if (dl.IsFaulted) { if (dl.IsFaulted) {
Log("Exception thrown by download task: " + dl.Exception); Log("Exception thrown by download task: " + dl.Exception);
break; break;
} else if (!dl.IsCompletedSuccessfully) { } else if (!dl.IsCompletedSuccessfully) {
Log($"Task for guild {guild.Id} is unresponsive. Skipping guild. Members: {guild.MemberCount}. Name: {guild.Name}."); Log($"Task unresponsive, will skip (ID {guild.Id}, with {guild.MemberCount} members).");
lock (_failedDownloads) _failedDownloads.Add(guild.Id); _skippedGuilds.Add(guild.Id);
continue; continue;
} }
// Prevent unnecessary disconnections by ShardManager if we're taking too long
if (DateTimeOffset.UtcNow - processStartTime > _singleDlTimeout) break;
} }
if (processed > 10) Log($"Member list downloads handled for {processed} guilds."); if (processed > 10) Log($"Member list downloads handled for {processed} guilds.");