bail on error immediately

This commit is contained in:
Basique Evangelist 2021-10-17 14:46:51 +03:00
parent 6ff22680b9
commit 58f7e17ba6
Signed by untrusted user: BasiqueEvangelist
GPG Key ID: B370219149301706
2 changed files with 11 additions and 11 deletions

View File

@ -59,14 +59,15 @@ namespace JetKarmaBot
public async Task Stop()
{
if (stopped) return;
Client.StopReceiving();
timeoutWaitTaskToken.Cancel();
Client?.StopReceiving();
timeoutWaitTaskToken?.Cancel();
try
{
await timeoutWaitTask;
if (timeoutWaitTask != null)
await timeoutWaitTask;
}
catch (OperationCanceledException) { }
await Timeout.Save();
await Timeout?.Save();
Dispose();
stopped = true;
}
@ -119,8 +120,8 @@ namespace JetKarmaBot
public void Dispose()
{
timeoutWaitTaskToken.Dispose();
timeoutWaitTask.Dispose();
timeoutWaitTaskToken?.Dispose();
timeoutWaitTask?.Dispose();
}
#endregion

View File

@ -42,14 +42,13 @@ namespace JetKarmaBot
try
{
bot.Init().Wait();
bot.Init().GetAwaiter().GetResult();
log.Info("JetKarmaBot started. Press Ctrl-C to exit...");
Environment.ExitCode = (int)ExitCode.ErrorRunning;
}
catch (Exception ex)
{
log.Error(ex);
Environment.ExitCode = (int)ExitCode.ErrorException;
return (int)ExitCode.ErrorException;
}
ManualResetEvent quitEvent = new ManualResetEvent(false);
try
@ -62,14 +61,14 @@ namespace JetKarmaBot
AppDomain.CurrentDomain.ProcessExit += (sender, args) =>
{
log.Info("Received stop request, waiting for exit...");
bot?.Stop()?.Wait();
bot?.Stop()?.GetAwaiter().GetResult();
};
}
catch { }
quitEvent.WaitOne(Timeout.Infinite);
log.Info("Waiting for exit...");
bot?.Stop()?.Wait();
bot?.Stop()?.GetAwaiter().GetResult();
return (int)ExitCode.Ok;
}