From f42afa7eae7b5be7b89f480955d590d4275376ca Mon Sep 17 00:00:00 2001 From: Kaoticz <3125254-Kaoticz@users.noreply.gitlab.com> Date: Tue, 14 Jan 2025 03:10:12 +0000 Subject: [PATCH] Exit with status code 0 on graceful shutdowns --- src/NadekoBot/Bot.cs | 6 +++--- src/NadekoBot/_common/Impl/BotCredsProvider.cs | 2 +- src/NadekoBot/_common/Impl/RemoteGrpcCoordinator.cs | 2 +- .../_common/Services/Impl/SingleProcessCoordinator.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Bot.cs b/src/NadekoBot/Bot.cs index 37bcbee65..c4d31b295 100644 --- a/src/NadekoBot/Bot.cs +++ b/src/NadekoBot/Bot.cs @@ -218,12 +218,12 @@ public sealed class Bot : IBot catch (HttpException ex) { LoginErrorHandler.Handle(ex); - Helpers.ReadErrorAndExit(3); + Helpers.ReadErrorAndExit(101); } catch (Exception ex) { LoginErrorHandler.Handle(ex); - Helpers.ReadErrorAndExit(4); + Helpers.ReadErrorAndExit(5); } await clientReady.Task.ConfigureAwait(false); @@ -275,7 +275,7 @@ public sealed class Bot : IBot catch (Exception ex) { Log.Error(ex, "Error adding services"); - Helpers.ReadErrorAndExit(9); + Helpers.ReadErrorAndExit(103); } Log.Information("Shard {ShardId} connected in {Elapsed:F2}s", diff --git a/src/NadekoBot/_common/Impl/BotCredsProvider.cs b/src/NadekoBot/_common/Impl/BotCredsProvider.cs index 3a4a82400..ae6f9d50c 100644 --- a/src/NadekoBot/_common/Impl/BotCredsProvider.cs +++ b/src/NadekoBot/_common/Impl/BotCredsProvider.cs @@ -82,7 +82,7 @@ public sealed class BotCredsProvider : IBotCredsProvider if (string.IsNullOrWhiteSpace(_creds.Token)) { Log.Error("Token is missing from creds.yml or Environment variables.\nAdd it and restart the program"); - Helpers.ReadErrorAndExit(5); + Helpers.ReadErrorAndExit(1); return; } diff --git a/src/NadekoBot/_common/Impl/RemoteGrpcCoordinator.cs b/src/NadekoBot/_common/Impl/RemoteGrpcCoordinator.cs index ed395dac4..a2b01bd87 100644 --- a/src/NadekoBot/_common/Impl/RemoteGrpcCoordinator.cs +++ b/src/NadekoBot/_common/Impl/RemoteGrpcCoordinator.cs @@ -107,7 +107,7 @@ public class RemoteGrpcCoordinator : ICoordinator, IReadyExecutor await Task.Delay(7500); } - Environment.Exit(5); + Environment.Exit(0); }); return Task.CompletedTask; diff --git a/src/NadekoBot/_common/Services/Impl/SingleProcessCoordinator.cs b/src/NadekoBot/_common/Services/Impl/SingleProcessCoordinator.cs index 5ae4c3994..954438c8a 100644 --- a/src/NadekoBot/_common/Services/Impl/SingleProcessCoordinator.cs +++ b/src/NadekoBot/_common/Services/Impl/SingleProcessCoordinator.cs @@ -33,7 +33,7 @@ public class SingleProcessCoordinator : ICoordinator } public void Die(bool graceful = false) - => Environment.Exit(5); + => Environment.Exit(0); public bool RestartShard(int shardId) => RestartBot();