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

Logging Bug

Browse source 
- added data check when configuring logging.
- removed workshop interval expiry options.
- removed RCON password from logs.
This commit is contained in:
Brett Hewitson 2022-07-25 09:39:30 +10:00
parent 99cdcd6375
commit 96ba2c3474
23 changed files with 103 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ConanServerManager/App.config
View file

@ -420,9 +420,6 @@
<setting name="EmailNotify_ShutdownRestart" serializeAs="String">
<value>False</value>
</setting>
<setting name="WorkshopCache_ExpiredHours" serializeAs="String">
<value>168</value>
</setting>
<setting name="ServerShutdown_CancelMessage" serializeAs="String">
<value>Server shutdown has been cancelled.</value>
</setting>

3
src/ConanServerManager/App.xaml.cs
View file

@ -580,6 +580,9 @@ namespace ServerManagerTool
public static void ReconfigureLogging()
{
if (string.IsNullOrWhiteSpace(Config.Default.DataPath))
return;
UpdateLoggingStatus();
var logDir = Path.Combine(Config.Default.DataPath, Config.Default.LogsRelativePath);

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

@ -854,18 +854,6 @@ namespace ServerManagerTool {
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("168")]
public int WorkshopCache_ExpiredHours {
get {
return ((int)(this["WorkshopCache_ExpiredHours"]));
}
set {
this["WorkshopCache_ExpiredHours"] = value;
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("server")]

3
src/ConanServerManager/Config.settings
View file

@ -236,9 +236,6 @@
<Setting Name="EmailNotify_ShutdownRestart" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="WorkshopCache_ExpiredHours" Type="System.Int32" Scope="User">
<Value Profile="(Default)">168</Value>
</Setting>
<Setting Name="DefaultServerRelativePath" Type="System.String" Scope="Application">
<Value Profile="(Default)">server</Value>
</Setting>

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

@ -777,8 +777,6 @@
<sys:String x:Key="GlobalSettings_ForceCopyModsTooltip">If enabled, the mod files will be copied to the server folder even if the server has the latest version. Enabling can fix mod corruption issues.</sys:String>
<sys:String x:Key="GlobalSettings_ForceUpdateModsIfNoSteamInfoLabel">Force mod file downloads when no steam information available</sys:String>
<sys:String x:Key="GlobalSettings_ForceUpdateModsIfNoSteamInfoTooltip">If enabled, the mods will be downloaded from steam even when no steam information is available.</sys:String>
<sys:String x:Key="GlobalSettings_WorkshopCacheExpiredHoursLabel">Workshop Cache Expiry</sys:String>
<sys:String x:Key="GlobalSettings_WorkshopCacheExpiredHoursTooltip">The number of hours since the last refresh the workshop cache will be considered old and will auto refresh. Set to 0 to never expire the cache, you must manually refresh the cache.</sys:String>
<sys:String x:Key="GlobalSettings_BackupSettingsLabel">Backup Settings</sys:String>
<sys:String x:Key="GlobalSettings_BackupIncludeSaveGamesFolderLabel">Include the SaveGames folder when performing a WorldSave backup</sys:String>

2
src/ConanServerManager/Lib/ServerRcon.cs
View file

@ -422,7 +422,7 @@ namespace ServerManagerTool.Lib
}
_maxCommandRetries = 10;
_errorLogger?.Error($"Failed to connect to Rcon at {_rconParameters.RconHostIP}:{_rconParameters.RconPort} with {_rconParameters.RconPassword}. {lastException.Message}");
_errorLogger?.Error($"Failed to connect to Rcon at {_rconParameters.RconHostIP}:{_rconParameters.RconPort}. {lastException.Message}");
throw new Exception($"Command failed to send after {_maxCommandRetries} attempts. Last exception: {lastException.Message}", lastException);
}
#endregion

2
src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
View file

@ -306,8 +306,6 @@
<CheckBox Grid.Row="0" Grid.Column="6" Margin="0,0,0,5" IsChecked="{Binding Config.ServerUpdate_ForceCopyMods, Mode=TwoWay}" Content="{DynamicResource GlobalSettings_ForceCopyModsLabel}" ToolTip="{DynamicResource GlobalSettings_ForceCopyModsTooltip}" HorizontalAlignment="Left"/>
<CheckBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="6" Margin="5,0,0,0" IsChecked="{Binding Config.ServerUpdate_ForceUpdateModsIfNoSteamInfo, Mode=TwoWay}" Content="{DynamicResource GlobalSettings_ForceUpdateModsIfNoSteamInfoLabel}" ToolTip="{DynamicResource GlobalSettings_ForceUpdateModsIfNoSteamInfoTooltip}" HorizontalAlignment="Left"/>
<cctl:AnnotatedSlider Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="4" Margin="0,0,5,0" Label="{DynamicResource GlobalSettings_WorkshopCacheExpiredHoursLabel}" Value="{Binding Config.WorkshopCache_ExpiredHours}" Minimum="0" Maximum="1000" SmallChange="1" LargeChange="12" TickFrequency="24" LabelRelativeWidth="Auto" SliderRelativeWidth="15*" SuffixRelativeWidth="Auto" Suffix="{DynamicResource SliderUnits_Hours}" ToolTip="{DynamicResource GlobalSettings_WorkshopCacheExpiredHoursTooltip}"/>
</Grid>
</GroupBox>

1
src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs
View file

@ -674,7 +674,6 @@ namespace ServerManagerTool
comment.AppendLine($"ServerUpdate_ForceUpdateMods: {Config.Default.ServerUpdate_ForceUpdateMods}");
comment.AppendLine($"ServerUpdate_ForceCopyMods: {Config.Default.ServerUpdate_ForceCopyMods}");
comment.AppendLine($"ServerUpdate_ForceUpdateModsIfNoSteamInfo: {Config.Default.ServerUpdate_ForceUpdateModsIfNoSteamInfo}");
comment.AppendLine($"WorkshopCache_ExpiredHours: {Config.Default.WorkshopCache_ExpiredHours}");
if (!string.IsNullOrWhiteSpace(Config.Default.BackupPath))
comment.AppendLine($"Backup Directory: {Config.Default.BackupPath}");

9
src/ConanServerManager/VersionFeed.xml
View file

@ -9,10 +9,10 @@
<entry>
<id>urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B</id>
<title>1.1.79 (1.1.79.2)</title>
<summary>1.1.79.2</summary>
<title>1.1.79 (1.1.79.3)</title>
<summary>1.1.79.3</summary>
<link href="" />
<updated>2022-07-16T00:00:00Z</updated>
<updated>2022-07-25T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
@ -20,7 +20,8 @@
<br/>
<ul>
<li>Server Status - changed the server status code to stop the status cycling and to be more accurate.</li>
<li>Added a check for a valid configuration file when starting the server manager.\r\nIf config file is not valid, then it will delete the config file and shutdown the manager, with a message to restart the manager.</li>
<li>Added a check for a valid configuration file when starting the server manager. If config file is not valid, then it will delete the config file and shutdown the manager, with a message to restart the manager.</li>
<li>Fixed a crash bug when trying to set the logging folder.</li>
</ul>
</p>
</div>

25
src/ConanServerManager/VersionFeedBeta.xml
View file

@ -5,7 +5,30 @@
<title>Conan Server Manager Version Feed</title>
<subtitle>This is the Conan Server Manager beta version feed.</subtitle>
<link href="https://servermanagers.freeforums.net/" />
<updated>2022-07-16T00:00:00Z</updated>
<updated>2022-07-25T00:00:00Z</updated>
<entry>
<id>urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B</id>
<title>1.1.79 (1.1.79.3)</title>
<summary>1.1.79.3</summary>
<link href="" />
<updated>2022-07-25T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">BUGFIX</u>
<br/>
<ul>
<li>Fixed a crash bug when trying to set the logging folder.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B</id>

5
src/ConanServerManager/Windows/WorkshopFilesWindow.xaml.cs
View file

@ -169,11 +169,6 @@ namespace ServerManagerTool
if (loadFromCacheFile)
{
steamCache = localCache;
// check if the cache is old
if (localCache != null && Config.Default.WorkshopCache_ExpiredHours > 0 && localCache.cached.AddHours(Config.Default.WorkshopCache_ExpiredHours) < DateTime.UtcNow)
// cache is considered old, clear cache variable so it will reload from internet
steamCache = null;
}
// check if the cache exists