Noi/BirthdayBot
1
0
Fork 0
mirror of https://github.com/NoiTheCat/BirthdayBot.git synced 2024-11-24 01:14:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvements to shard disposal

Browse source
This commit is contained in:
Noi 2020-10-29 00:54:14 -07:00
parent d08fc45774
commit 8e6da3c8d0
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ShardInstance.cs
View file

@ -47,7 +47,7 @@ namespace BirthdayBot
// Background task constructor begins background processing immediately. // Background task constructor begins background processing immediately.
_background = new ShardBackgroundWorker(this); _background = new ShardBackgroundWorker(this);
DiscordClient.Disconnected += DiscordClient_Disconnected; DiscordClient.Disconnected += Client_Disconnected;
} }
/// <summary> /// <summary>
@ -55,18 +55,24 @@ namespace BirthdayBot
/// </summary> /// </summary>
public async Task StartAsync() public async Task StartAsync()
{ {
await DiscordClient.LoginAsync(TokenType.Bot, Config.BotToken); await DiscordClient.LoginAsync(TokenType.Bot, Config.BotToken).ConfigureAwait(false);
await DiscordClient.StartAsync(); await DiscordClient.StartAsync().ConfigureAwait(false);
} }
/// <summary> /// <summary>
/// Does all necessary steps to stop this shard. This method may block for a few seconds as it waits /// Does all necessary steps to stop this shard. This method may block for a few seconds as it waits
/// for the process to finish, but will force its disposal after at most 15 seconds. /// for the process to finish, but will force its disposal after at most 30 seconds.
/// </summary> /// </summary>
public void Dispose() public void Dispose()
{ {
Log("Instance", "Cleaning up..."); Log("Instance", "Cleaning up...");
// Unsubscribe from own events
DiscordClient.Log -= Client_Log;
DiscordClient.Ready -= Client_Ready;
DiscordClient.MessageReceived -= Client_MessageReceived;
DiscordClient.Disconnected -= Client_Disconnected;
_background.Dispose(); _background.Dispose();
try try
{ {
@ -87,7 +93,10 @@ namespace BirthdayBot
Log("Instance", "Warning: Client threw an exception when stopping: " + ex.Message); Log("Instance", "Warning: Client threw an exception when stopping: " + ex.Message);
} }
DiscordClient.Dispose(); var clientDispose = Task.Run(DiscordClient.Dispose);
if (!clientDispose.Wait(10000))
Log("Instance", "Warning: Client hanging on dispose.");
Log("Instance", "Shard instance disposed.");
} }
public void Log(string source, string message) => Program.Log($"Shard {ShardId:00}] [{source}", message); public void Log(string source, string message) => Program.Log($"Shard {ShardId:00}] [{source}", message);
@ -129,7 +138,7 @@ namespace BirthdayBot
/// <summary> /// <summary>
/// Notify ConnectionStatus of a disconnect. /// Notify ConnectionStatus of a disconnect.
/// </summary> /// </summary>
private Task DiscordClient_Disconnected(Exception arg) private Task Client_Disconnected(Exception arg)
{ {
_background.ConnStatus.Disconnected(); _background.ConnStatus.Disconnected();
return Task.CompletedTask; return Task.CompletedTask;