tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-05-06 15:17:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Server Log Option

Browse source
This commit is contained in:
Brett Hewitson 2022-05-21 12:27:51 +10:00
parent aee6a394fe
commit 3d606835ea
12 changed files with 50 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ConanServerManager/App.config
View file

@ -243,7 +243,7 @@
<value>whitelist.txt</value>
</setting>
<setting name="ServerCommandLineStandardArgs" serializeAs="String">
<value>-listen -nosteamclient -game -server -log</value>
<value>-listen -nosteamclient -game -server</value>
</setting>
<setting name="GameDataUrl" serializeAs="String">
<value>https://servermanagers.freeforums.net/</value>

2
src/ConanServerManager/Config.Designer.cs generated
View file

@ -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"]));

2
src/ConanServerManager/Config.settings
View file

@ -468,7 +468,7 @@
<Value Profile="(Default)">whitelist.txt</Value>
</Setting>
<Setting Name="ServerCommandLineStandardArgs" Type="System.String" Scope="Application">
<Value Profile="(Default)">-listen -nosteamclient -game -server -log</Value>
<Value Profile="(Default)">-listen -nosteamclient -game -server</Value>
</Setting>
<Setting Name="AutoUpdate_SequencialDelayPeriod" Type="System.Int32" Scope="User">
<Value Profile="(Default)">10</Value>

2
src/ConanServerManager/Globalization/en-US/en-US.xaml
View file

@ -1198,6 +1198,8 @@
<sys:String x:Key="ServerSettings_ServerTransferEnabledTooltip">If enabled, will enable character server transfers.</sys:String>
<sys:String x:Key="ServerSettings_CanImportDirectlyFromSameServerLabel">Can Import Directly from Same Server</sys:String>
<sys:String x:Key="ServerSettings_CanImportDirectlyFromSameServerTooltip">If enabled, will allow players to directly import characters that were exported from exactly the same server.</sys:String>
<sys:String x:Key="ServerSettings_OutputServerLogLabel">Output Server Log to Server Console</sys:String>
<sys:String x:Key="ServerSettings_OutputServerLogTooltip">If enabled, the server logs will be output to the server console.</sys:String>
<sys:String x:Key="ServerSettings_CommandLineLabel">Command Line</sys:String>
<sys:String x:Key="ServerSettings_ProcessPriorityLabel">Priority:</sys:String>

21
src/ConanServerManager/Lib/ServerProfile.cs
View file

@ -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);

3
src/ConanServerManager/UserControls/ServerSettingsControl.xaml
View file

@ -772,6 +772,7 @@
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" MinWidth="100"/>
@ -797,6 +798,8 @@
<CheckBox Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,5,5,0" Content="{DynamicResource ServerSettings_ServerTransferEnabledLabel}" IsChecked="{Binding ServerTransferEnabled}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_ServerTransferEnabledTooltip}" HorizontalAlignment="Left"/>
<CheckBox Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" Margin="5,5,5,0" Content="{DynamicResource ServerSettings_CanImportDirectlyFromSameServerLabel}" IsChecked="{Binding CanImportDirectlyFromSameServer}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_CanImportDirectlyFromSameServerTooltip}" HorizontalAlignment="Left"/>
<CheckBox Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,5,5,0" Content="{DynamicResource ServerSettings_OutputServerLogLabel}" IsChecked="{Binding OutputServerLog}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_OutputServerLogTooltip}" HorizontalAlignment="Left"/>
</Grid>
</GroupBox>