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

Attempt to fix slow/timeout-y bot startup

Browse Source 
I've noticed the bot's CPU spiking for a few minutes as it's
just connecting, and a lot of shard connections are timing out.

I suspect it might be the overload of messages as the shards
connect and Discord sends it the entire backlog at once. So,
as an interim solution, I'm making it simply discard every
message before the socket is fully connected. Hopefully this
should help reduce the pressure.
This commit is contained in:
Ske 2019-10-31 17:21:12 +01:00
parent f4a5b409c3
commit 0f48c6879b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PluralKit.Bot/Bot.cs
View File

@ -86,7 +86,10 @@ namespace PluralKit.Bot
{ {
MessageCacheSize = 5, MessageCacheSize = 5,
ExclusiveBulkDelete = true, ExclusiveBulkDelete = true,
DefaultRetryMode = RetryMode.AlwaysRetry DefaultRetryMode = RetryMode.AlwaysRetry,
// Commented this out since Debug actually sends, uh, quite a lot that's not necessary in production
// but leaving it here in case I (or someone else) get[s] confused about why logging isn't working again :p
// LogLevel = LogSeverity.Debug // We filter log levels in Serilog, so just pass everything through (Debug is lower than Verbose)
})) }))
.AddSingleton<Bot>() .AddSingleton<Bot>()
.AddTransient<CommandTree>() .AddTransient<CommandTree>()
@ -172,10 +175,10 @@ namespace PluralKit.Bot
level = LogEventLevel.Error; level = LogEventLevel.Error;
else if (msg.Severity == LogSeverity.Info) else if (msg.Severity == LogSeverity.Info)
level = LogEventLevel.Information; level = LogEventLevel.Information;
else if (msg.Severity == LogSeverity.Verbose) else if (msg.Severity == LogSeverity.Debug) // D.NET's lowest level is Debug and Verbose is greater, Serilog's is the other way around
level = LogEventLevel.Verbose; level = LogEventLevel.Verbose;
else if (msg.Severity == LogSeverity.Warning) else if (msg.Severity == LogSeverity.Verbose)
level = LogEventLevel.Warning; level = LogEventLevel.Debug;
_logger.Write(level, msg.Exception, "Discord.Net {Source}: {Message}", msg.Source, msg.Message); _logger.Write(level, msg.Exception, "Discord.Net {Source}: {Message}", msg.Source, msg.Message);
return Task.CompletedTask; return Task.CompletedTask;
@ -318,6 +321,9 @@ namespace PluralKit.Bot
public async Task HandleMessage(SocketMessage arg) public async Task HandleMessage(SocketMessage arg)
{ {
if (_client.GetShardFor((arg.Channel as IGuildChannel)?.Guild).ConnectionState != ConnectionState.Connected)
return; // Discard messages while the bot "catches up" to avoid unnecessary CPU pressure causing timeouts
RegisterMessageMetrics(arg); RegisterMessageMetrics(arg);
// Ignore system messages (member joined, message pinned, etc) // Ignore system messages (member joined, message pinned, etc)