From 59c0f2f4b3e6e7f64ade013dceff50447b97e809 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 1 Dec 2021 09:47:41 +0100 Subject: [PATCH] Added graceful option to die (kill coordinator without killing shards) --- src/NadekoBot/Modules/Administration/SelfCommands.cs | 4 ++-- src/NadekoBot/Services/ICoordinator.cs | 2 +- src/NadekoBot/Services/Impl/RemoteGrpcCoordinator.cs | 4 ++-- src/NadekoBot/Services/Impl/SingleProcessCoordinator.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/SelfCommands.cs b/src/NadekoBot/Modules/Administration/SelfCommands.cs index 5a80ebc96..fa495702e 100644 --- a/src/NadekoBot/Modules/Administration/SelfCommands.cs +++ b/src/NadekoBot/Modules/Administration/SelfCommands.cs @@ -318,7 +318,7 @@ namespace NadekoBot.Modules.Administration [NadekoCommand, Aliases] [OwnerOnly] - public async Task Die() + public async Task Die(bool graceful = false) { try { @@ -329,7 +329,7 @@ namespace NadekoBot.Modules.Administration // ignored } await Task.Delay(2000).ConfigureAwait(false); - _coord.Die(); + _coord.Die(graceful); } [NadekoCommand, Aliases] diff --git a/src/NadekoBot/Services/ICoordinator.cs b/src/NadekoBot/Services/ICoordinator.cs index 76190acec..bdd3185eb 100644 --- a/src/NadekoBot/Services/ICoordinator.cs +++ b/src/NadekoBot/Services/ICoordinator.cs @@ -7,7 +7,7 @@ namespace NadekoBot.Services public interface ICoordinator { bool RestartBot(); - void Die(); + void Die(bool graceful); bool RestartShard(int shardId); IList GetAllShardStatuses(); int GetGuildCount(); diff --git a/src/NadekoBot/Services/Impl/RemoteGrpcCoordinator.cs b/src/NadekoBot/Services/Impl/RemoteGrpcCoordinator.cs index 786189f73..0b175e8c9 100644 --- a/src/NadekoBot/Services/Impl/RemoteGrpcCoordinator.cs +++ b/src/NadekoBot/Services/Impl/RemoteGrpcCoordinator.cs @@ -39,11 +39,11 @@ namespace NadekoBot.Services return true; } - public void Die() + public void Die(bool graceful) { _coordClient.Die(new DieRequest() { - Graceful = false + Graceful = graceful }); } diff --git a/src/NadekoBot/Services/Impl/SingleProcessCoordinator.cs b/src/NadekoBot/Services/Impl/SingleProcessCoordinator.cs index b7638c561..ddb310ccd 100644 --- a/src/NadekoBot/Services/Impl/SingleProcessCoordinator.cs +++ b/src/NadekoBot/Services/Impl/SingleProcessCoordinator.cs @@ -36,7 +36,7 @@ namespace NadekoBot.Services return true; } - public void Die() + public void Die(bool graceful = false) { Environment.Exit(5); }