Noi/BirthdayBot
1
0
Fork 0
mirror of https://github.com/NoiTheCat/BirthdayBot.git synced 2024-11-21 13:54:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More thorough exception handling on dispose

Browse source
This commit is contained in:
Noi 2020-10-05 16:10:02 -07:00
parent 2da4f3e0e3
commit e1a4dab746
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ShardInstance.cs
View file

@ -72,14 +72,24 @@ namespace BirthdayBot
_background.Dispose(); _background.Dispose();
try try
{ {
var logout = DiscordClient.LogoutAsync(); if (!DiscordClient.LogoutAsync().Wait(15000))
logout.Wait(15000); Log("Instance", "Warning: Client has not yet logged out. Continuing cleanup.");
if (!logout.IsCompleted) Log("Instance", "Warning: Client has not yet logged out. Forcing its disposal.");
} }
finally catch (Exception ex)
{ {
DiscordClient.Dispose(); Log("Instance", "Warning: Client threw an exception when logging out: " + ex.Message);
} }
try
{
if (!DiscordClient.StopAsync().Wait(5000))
Log("Instance", "Warning: Client has not yet stopped. Continuing cleanup.");
}
catch (Exception ex)
{
Log("Instance", "Warning: Client threw an exception when stopping: " + ex.Message);
}
DiscordClient.Dispose();
} }
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);