liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure we only attach shard listeners once

Browse Source
This commit is contained in:
Ske 2020-05-31 03:19:42 +02:00
parent fbbbb51998
commit ae74dce2ce
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PluralKit.Bot/Services/ShardInfoService.cs
View File

@ -16,6 +16,7 @@ namespace PluralKit.Bot
public class ShardInfo public class ShardInfo
{ {
public bool HasAttachedListeners;
public Instant LastConnectionTime; public Instant LastConnectionTime;
public Instant LastHeartbeatTime; public Instant LastHeartbeatTime;
public int DisconnectionCount; public int DisconnectionCount;
@ -45,7 +46,14 @@ namespace PluralKit.Bot
// This callback doesn't actually receive the shard that was opening, so we just try to check we have 'em all (so far) // This callback doesn't actually receive the shard that was opening, so we just try to check we have 'em all (so far)
foreach (var (id, shard) in _client.ShardClients) foreach (var (id, shard) in _client.ShardClients)
{ {
if (_shardInfo.ContainsKey(id)) continue; // Get or insert info in the client dict
if (_shardInfo.TryGetValue(id, out var info))
{
// Skip adding listeners if we've seen this shard & already added listeners to it
if (info.HasAttachedListeners) continue;
} else _shardInfo[id] = info = new ShardInfo();
// Call our own SocketOpened listener manually (and then attach the listener properly) // Call our own SocketOpened listener manually (and then attach the listener properly)
await SocketOpened(shard); await SocketOpened(shard);
shard.SocketOpened += () => SocketOpened(shard); shard.SocketOpened += () => SocketOpened(shard);
@ -56,6 +64,9 @@ namespace PluralKit.Bot
shard.Ready += Ready; shard.Ready += Ready;
shard.SocketClosed += SocketClosed; shard.SocketClosed += SocketClosed;
shard.Heartbeated += Heartbeated; shard.Heartbeated += Heartbeated;
// Register that we've seen it
info.HasAttachedListeners = true;
} }
} }