diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config index 035ccb30..4900dffe 100644 --- a/src/ARKServerManager/App.config +++ b/src/ARKServerManager/App.config @@ -57,7 +57,7 @@ ?QueryPort={0} - -nosteamclient -game -server -log + -nosteamclient -game -server Profiles diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs index ed890a30..19c01e58 100644 --- a/src/ARKServerManager/Config.Designer.cs +++ b/src/ARKServerManager/Config.Designer.cs @@ -154,7 +154,7 @@ namespace ServerManagerTool { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("-nosteamclient -game -server -log")] + [global::System.Configuration.DefaultSettingValueAttribute("-nosteamclient -game -server")] public string ServerCommandLineStandardArgs { get { return ((string)(this["ServerCommandLineStandardArgs"])); diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings index eb8c5cbd..1613106c 100644 --- a/src/ARKServerManager/Config.settings +++ b/src/ARKServerManager/Config.settings @@ -45,7 +45,7 @@ ?QueryPort={0} - -nosteamclient -game -server -log + -nosteamclient -game -server Profiles diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml index e2725f72..36ead293 100644 --- a/src/ARKServerManager/Globalization/en-US/en-US.xaml +++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml @@ -1171,6 +1171,8 @@ Enable BattlEye Anti-Cheat System If enabled, the BattlEye Anti-Cheat System will be enabled. x + Output Server Log to Server Console + If enabled, the server logs will be output to the server console. Use All Available Cores If enabled, all of your CPU cores will be used, if all of them are not being utilized after using this launch option, then try to disable it. Use Cache diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs index 6e696b10..2f2a8bce 100644 --- a/src/ARKServerManager/Lib/ServerProfile.cs +++ b/src/ARKServerManager/Lib/ServerProfile.cs @@ -724,6 +724,14 @@ namespace ServerManagerTool.Lib set { SetValue(UseVivoxProperty, value); } } + public static readonly DependencyProperty OutputServerLogProperty = DependencyProperty.Register(nameof(OutputServerLog), typeof(bool), typeof(ServerProfile), new PropertyMetadata(true)); + [DataMember] + public bool OutputServerLog + { + get { return (bool)GetValue(OutputServerLogProperty); } + set { SetValue(OutputServerLogProperty, value); } + } + public static readonly DependencyProperty AllowSharedConnectionsProperty = DependencyProperty.Register(nameof(AllowSharedConnections), typeof(bool), typeof(ServerProfile), new PropertyMetadata(true)); [IniFileEntry(IniFiles.GameUserSettings, IniSections.GUS_ServerSettings, ServerProfileCategory.Administration)] public bool AllowSharedConnections @@ -4002,6 +4010,11 @@ namespace ServerManagerTool.Lib serverArgs.Append(' '); serverArgs.Append(Config.Default.ServerCommandLineStandardArgs); + if (this.OutputServerLog) + { + serverArgs.Append($" -log"); + } + return serverArgs.ToString(); } @@ -5217,6 +5230,7 @@ namespace ServerManagerTool.Lib this.ClearValue(CrossplayProperty); this.ClearValue(EpicOnlyProperty); this.ClearValue(EnablePublicIPForEpicProperty); + this.ClearValue(OutputServerLogProperty); this.ClearValue(AltSaveDirectoryNameProperty); this.ClearValue(CrossArkClusterIdProperty); @@ -5874,6 +5888,7 @@ namespace ServerManagerTool.Lib this.SetValue(CrossplayProperty, sourceProfile.Crossplay); this.SetValue(EpicOnlyProperty, sourceProfile.EpicOnly); this.SetValue(EnablePublicIPForEpicProperty, sourceProfile.EnablePublicIPForEpic); + this.SetValue(OutputServerLogProperty, sourceProfile.OutputServerLog); //this.SetValue(AltSaveDirectoryNameProperty, sourceProfile.AltSaveDirectoryName); this.SetValue(CrossArkClusterIdProperty, sourceProfile.CrossArkClusterId); this.SetValue(ClusterDirOverrideProperty, sourceProfile.ClusterDirOverride); diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml index ab0c303c..bce7b3a3 100644 --- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml @@ -1016,6 +1016,7 @@ + diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config index cc3c952d..ccc3c87b 100644 --- a/src/ConanServerManager/App.config +++ b/src/ConanServerManager/App.config @@ -243,7 +243,7 @@ whitelist.txt - -listen -nosteamclient -game -server -log + -listen -nosteamclient -game -server https://servermanagers.freeforums.net/ diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs index 08b3b1f0..c6757a1b 100644 --- a/src/ConanServerManager/Config.Designer.cs +++ b/src/ConanServerManager/Config.Designer.cs @@ -1671,7 +1671,7 @@ namespace ServerManagerTool { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("-listen -nosteamclient -game -server -log")] + [global::System.Configuration.DefaultSettingValueAttribute("-listen -nosteamclient -game -server")] public string ServerCommandLineStandardArgs { get { return ((string)(this["ServerCommandLineStandardArgs"])); diff --git a/src/ConanServerManager/Config.settings b/src/ConanServerManager/Config.settings index 9cce06c8..bbde8652 100644 --- a/src/ConanServerManager/Config.settings +++ b/src/ConanServerManager/Config.settings @@ -468,7 +468,7 @@ whitelist.txt - -listen -nosteamclient -game -server -log + -listen -nosteamclient -game -server 10 diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml index 41d977d4..5bd906d6 100644 --- a/src/ConanServerManager/Globalization/en-US/en-US.xaml +++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml @@ -1198,6 +1198,8 @@ If enabled, will enable character server transfers. Can Import Directly from Same Server If enabled, will allow players to directly import characters that were exported from exactly the same server. + Output Server Log to Server Console + If enabled, the server logs will be output to the server console. Command Line Priority: diff --git a/src/ConanServerManager/Lib/ServerProfile.cs b/src/ConanServerManager/Lib/ServerProfile.cs index 185b2256..f470781b 100644 --- a/src/ConanServerManager/Lib/ServerProfile.cs +++ b/src/ConanServerManager/Lib/ServerProfile.cs @@ -396,6 +396,14 @@ namespace ServerManagerTool.Lib set { SetValue(CanImportDirectlyFromSameServerProperty, value); } } + public static readonly DependencyProperty OutputServerLogProperty = DependencyProperty.Register(nameof(OutputServerLog), typeof(bool), typeof(ServerProfile), new PropertyMetadata(true)); + [DataMember] + public bool OutputServerLog + { + get { return (bool)GetValue(OutputServerLogProperty); } + set { SetValue(OutputServerLogProperty, value); } + } + public static readonly DependencyProperty ProcessPriorityProperty = DependencyProperty.Register(nameof(ProcessPriority), typeof(string), typeof(ServerProfile), new PropertyMetadata("normal")); [DataMember] public string ProcessPriority @@ -868,6 +876,11 @@ namespace ServerManagerTool.Lib serverArgs.Append(" "); serverArgs.Append(Config.Default.ServerCommandLineStandardArgs); + if (this.OutputServerLog) + { + serverArgs.Append($" -log"); + } + return serverArgs.ToString(); } @@ -1481,6 +1494,10 @@ namespace ServerManagerTool.Lib this.ClearValue(KickIdlePlayersPercentageProperty); this.ClearValue(KickIdlePlayersPeriodProperty); + + this.ClearValue(ServerTransferEnabledProperty); + this.ClearValue(CanImportDirectlyFromSameServerProperty); + this.ClearValue(OutputServerLogProperty); } // section reset methods @@ -1580,6 +1597,10 @@ namespace ServerManagerTool.Lib this.SetValue(KickIdlePlayersPercentageProperty, sourceProfile.KickIdlePlayersPercentage); this.SetValue(KickIdlePlayersPeriodProperty, sourceProfile.KickIdlePlayersPeriod); + this.SetValue(ServerTransferEnabledProperty, sourceProfile.ServerTransferEnabled); + this.SetValue(CanImportDirectlyFromSameServerProperty, sourceProfile.CanImportDirectlyFromSameServer); + this.SetValue(OutputServerLogProperty, sourceProfile.OutputServerLog); + this.SetValue(LauncherArgsOverrideProperty, sourceProfile.LauncherArgsOverride); this.SetValue(LauncherArgsProperty, sourceProfile.LauncherArgs); this.SetValue(AdditionalArgsProperty, sourceProfile.AdditionalArgs); diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml index 394787c4..911f7308 100644 --- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml @@ -772,6 +772,7 @@ + @@ -797,6 +798,8 @@ + +