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

Drain the channel too

Browse Source
This commit is contained in:
Dominion
2023-06-03 02:34:13 -04:00
parent 7fd744f9dc
commit ac2c7aebf5
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
+15 -1
View File
@@ -209,7 +209,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
serviceProvider = new ServiceCollection()
.AddDiscordGateway(serviceProvider => botToken)
.Configure<DiscordGatewayClientOptions>(options => options.Intents |= GatewayIntents.MessageContents)
.AddSingleton<IDiscordResponders>(serviceProvider => this)
.AddSingleton(serviceProvider => (IDiscordResponders)this)
.AddResponder<DiscordForwardingResponder>()
.BuildServiceProvider();
}
@@ -255,7 +255,21 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
if (!channel.Writer.TryComplete())
Logger.LogCritical("Workaround failed (channel already closed), you may be deadlocked!");
else
{
// drain the channel, fuck the results
// DCT: None available
await foreach (var result in channel.Reader.ReadAllAsync(default))
try
{
await result;
}
catch (Exception ex)
{
Logger.LogDebug(ex, "Channel draining exception!");
}
Logger.LogInformation("Workaround seems successful. Awaiting ServiceProvider disposal...");
}
}
else
Logger.LogCritical(