cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 23:17:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1261 from tgstation/1250-ThatBloodyDiscordBug

Browse Source 
Fixes Discord bot reconnection issue
This commit is contained in:
Jordan Brown
2021-05-09 19:21:35 -04:00
committed by GitHub
parent ed7f142cb6 4e19a10f93
commit 8a0fa5a34e
1 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
+59 -8
View File
@@ -19,7 +19,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
sealed class DiscordProvider : Provider
{
/// <inheritdoc />
public override bool Connected => client.ConnectionState == ConnectionState.Connected;
public override bool Connected => client.ConnectionState != ConnectionState.Disconnected;
/// <inheritdoc />
public override string BotMention
@@ -194,10 +194,6 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
Logger.LogTrace("Logged in.");
cancellationToken.ThrowIfCancellationRequested();
await client.StartAsync().ConfigureAwait(false);
Logger.LogTrace("Started.");
var channelsAvailable = new TaskCompletionSource<object>();
Task ReadyCallback()
{
@@ -208,6 +204,9 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
client.Ready += ReadyCallback;
try
{
await client.StartAsync().ConfigureAwait(false);
Logger.LogTrace("Started.");
using (cancellationToken.Register(() => channelsAvailable.SetCanceled()))
await channelsAvailable.Task.ConfigureAwait(false);
}
@@ -232,9 +231,61 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
try
{
cancellationToken.ThrowIfCancellationRequested();
await client.StopAsync().ConfigureAwait(false);
Logger.LogTrace("Stopped.");
await client.LogoutAsync().ConfigureAwait(false);
var disconnectTcs = new TaskCompletionSource<object>();
Task DisconnectCallback(Exception exception)
{
if (exception != null)
Logger.LogTrace(exception, "Error stopping discord client!");
disconnectTcs.TrySetResult(null);
return Task.CompletedTask;
}
try
{
client.Disconnected += DisconnectCallback;
await client.StopAsync().ConfigureAwait(false);
Logger.LogTrace("Waiting for disconnect callback...");
using (cancellationToken.Register(() => disconnectTcs.SetCanceled()))
await disconnectTcs.Task.ConfigureAwait(false);
// https://github.com/discord-net/Discord.Net/blob/8afef8245cfd1f8b56956dd4b4577ed3c6904be5/src/Discord.Net.WebSocket/ConnectionManager.cs#L176
// State isn't set to disconnected until AFTER the callback fires
// Meaning if we check this.Connected right now it will still return true
// Yielding here will prevent this
await Task.Yield();
Logger.LogTrace("Stop async complete.");
}
finally
{
client.Disconnected -= DisconnectCallback;
}
cancellationToken.ThrowIfCancellationRequested();
var logoutTcs = new TaskCompletionSource<object>();
Task LogoutCallback()
{
logoutTcs.TrySetResult(null);
return Task.CompletedTask;
}
client.LoggedOut += LogoutCallback;
try
{
await client.LogoutAsync().ConfigureAwait(false);
Logger.LogTrace("Waiting for logout callback...");
using (cancellationToken.Register(() => logoutTcs.SetCanceled()))
await logoutTcs.Task.ConfigureAwait(false);
}
finally
{
client.LoggedOut -= LogoutCallback;
}
Logger.LogDebug("Disconnected!");
}
catch (OperationCanceledException)