diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config index b61d4131..f1e17e9f 100644 --- a/src/ARKServerManager/App.config +++ b/src/ARKServerManager/App.config @@ -891,6 +891,9 @@ all + + Broadcast + diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs index b9301646..7636da6a 100644 --- a/src/ARKServerManager/Config.Designer.cs +++ b/src/ARKServerManager/Config.Designer.cs @@ -3159,5 +3159,17 @@ namespace ServerManagerTool { return ((string)(this["SaveGamesRelativePath"])); } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Broadcast")] + public string RCON_BackupMessageCommand { + get { + return ((string)(this["RCON_BackupMessageCommand"])); + } + set { + this["RCON_BackupMessageCommand"] = value; + } + } } } diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings index 3495f826..40ec1431 100644 --- a/src/ARKServerManager/Config.settings +++ b/src/ARKServerManager/Config.settings @@ -869,5 +869,8 @@ SaveGames + + Broadcast + \ No newline at end of file diff --git a/src/ARKServerManager/Lib/ServerApp.cs b/src/ARKServerManager/Lib/ServerApp.cs index 120d0744..942ef018 100644 --- a/src/ARKServerManager/Lib/ServerApp.cs +++ b/src/ARKServerManager/Lib/ServerApp.cs @@ -158,7 +158,7 @@ namespace ServerManagerTool.Lib if (!string.IsNullOrWhiteSpace(Config.Default.ServerBackup_WorldSaveMessage)) { ProcessAlert(AlertType.Backup, Config.Default.ServerBackup_WorldSaveMessage); - sent = SendMessageAsync(Config.Default.ServerBackup_WorldSaveMessage, cancellationToken).Result; + sent = SendMessageAsync(Config.Default.RCON_BackupMessageCommand, Config.Default.ServerBackup_WorldSaveMessage, cancellationToken).Result; if (sent) { emailMessage.AppendLine("sent server save message."); @@ -2664,6 +2664,7 @@ namespace ServerManagerTool.Lib LogProfileMessage($"{ex.StackTrace}", false); } + await Task.Delay(100); retries++; } } @@ -2677,11 +2678,16 @@ namespace ServerManagerTool.Lib } private async Task SendMessageAsync(string message, CancellationToken token) + { + return await SendMessageAsync(Config.Default.RCON_MessageCommand, message, token); + } + + private async Task SendMessageAsync(string mode, string message, CancellationToken token) { if (string.IsNullOrWhiteSpace(message) || !SendMessages) return false; - var sent = await SendCommandAsync($"{GetRconMessageCommand(Config.Default.RCON_MessageCommand)} {message}", false); + var sent = await SendCommandAsync($"{GetRconMessageCommand(mode)} {message}", false); if (sent) { diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml index 91b8c4eb..aa0804f7 100644 --- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml @@ -379,12 +379,9 @@ - - -