diff --git a/TGServerService/ChatCommands.cs b/TGServerService/ChatCommands.cs index 9ca1d13831..d60581d1e5 100644 --- a/TGServerService/ChatCommands.cs +++ b/TGServerService/ChatCommands.cs @@ -41,7 +41,7 @@ namespace TGServerService public RootChatCommand() { PrintHelpList = true; - Children = new Command[] { new CheckCommand(), new StatusCommand(), new PRsCommand(), new VersionCommand(), new AHelpCommand(), new NameCheckCommand(), new RevisionCommand(), new AdminWhoCommand(), new ByondCommand(), new KekCommand(), new RelayRestartCommand() }; + Children = new Command[] { new CheckCommand(), new StatusCommand(), new PRsCommand(), new VersionCommand(), new AHelpCommand(), new NameCheckCommand(), new RevisionCommand(), new AdminWhoCommand(), new ByondCommand(), new KekCommand() }; } } class RevisionCommand : ChatCommand @@ -262,22 +262,4 @@ namespace TGServerService return " |list>>"; } } - class RelayRestartCommand : ChatCommand - { - public RelayRestartCommand() - { - Keyword = "relayrestart"; - RequiresAdmin = true; - } - protected override ExitCode Run(IList parameters) - { - Instance.InitInterop(); - return ExitCode.Normal; - } - - public override string GetHelpText() - { - return "Restart the relay listener. This is a massive hack but it'll do for now"; - } - } } diff --git a/TGServerService/Interop.cs b/TGServerService/Interop.cs index 6d0652b7ec..8dec4f1df1 100644 --- a/TGServerService/Interop.cs +++ b/TGServerService/Interop.cs @@ -243,7 +243,8 @@ namespace TGServerService catch (Exception e) { TGServerService.WriteError("Nudge handler thread crashed: " + e.ToString(), TGServerService.EventID.NudgeCrash); - SendMessage("SERVICE: The relay handler crashed, use relayrestart to restore it! Error: " + e.Message, ChatMessageType.AdminInfo); + SendMessage("SERVICE: The relay handler crashed, I will attempt to restore it when the server reboots! Error: " + e.Message, ChatMessageType.AdminInfo); + RequestRestart(); } } }