sam/Catalogger.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: disconnect all shards when shard manager restarts, don't fetch old timeouts

Browse source
This commit is contained in:
sam 2024-11-12 17:25:50 +01:00
parent 492283b9c1
commit 0564206bf7
Signed by: sam
GPG key ID: 5F3C3C1B3166639D
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Catalogger.Backend/Bot/ShardedGatewayClient.cs
View file

@ -115,7 +115,9 @@ public class ShardedGatewayClient(
_logger.Information("Started shard {ShardId}/{ShardCount}", shardIndex, TotalShards);
}
return await await Task.WhenAny(tasks);
var taskResult = await await Task.WhenAny(tasks);
Disconnect();
return taskResult;
}
public int ShardIdFor(ulong guildId) => (int)((guildId >> 22) % (ulong)TotalShards);
@ -136,6 +138,17 @@ public class ShardedGatewayClient(
client.Dispose();
}
private void Disconnect()
{
_logger.Information("Disconnecting from Discord");
foreach (var shardId in _gatewayClients.Keys)
{
_logger.Debug("Disposing shard {shardId}", shardId);
if (_gatewayClients.Remove(shardId, out var client))
client.Dispose();
}
}
private IOptions<DiscordGatewayClientOptions> CloneOptions(
DiscordGatewayClientOptions options,
int shardId

6
Catalogger.Backend/Database/Repositories/TimeoutRepository.cs
View file

@ -20,7 +20,11 @@ public class TimeoutRepository(DatabaseConnection conn) : IDisposable, IAsyncDis
);
public async Task<List<DiscordTimeout>> GetAllAsync() =>
(await conn.QueryAsync<DiscordTimeout>("select * from timeouts order by id")).ToList();
(
await conn.QueryAsync<DiscordTimeout>(
"select * from timeouts where until > now() order by id"
)
).ToList();
public async Task<DiscordTimeout> SetAsync(
Snowflake guildId,