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/ARKServerManager/App.config
View file

@ -558,9 +558,6 @@
<setting name="EmailNotify_ShutdownRestart" serializeAs="String">
<value>False</value>
</setting>
<setting name="WorkshopCache_ExpiredHours" serializeAs="String">
<value>168</value>
</setting>
<setting name="SectionPGMIsExpanded" serializeAs="String">
<value>False</value>
</setting>

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

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

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

@ -1289,18 +1289,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/ARKServerManager/Config.settings
View file

@ -362,9 +362,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="DefaultServerFolderName" Type="System.String" Scope="Application">
<Value Profile="(Default)">Server</Value>
</Setting>

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

@ -620,8 +620,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>

62
src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml
View file

@ -15,17 +15,18 @@
<!--#region 游戏地图名称 -->
<sys:String x:Key="Map_TheIsland">孤岛(The Island)</sys:String>
<sys:String x:Key="Map_TheCenter">中心岛地图(The Center)</sys:String>
<sys:String x:Key="Map_ScorchedEarth_P">焦土地图(Scorched Earth)</sys:String>
<sys:String x:Key="Map_Ragnarok">仙境地图(Ragnarok)</sys:String>
<sys:String x:Key="Map_Aberration_P">畸变地图(Aberration)</sys:String>
<sys:String x:Key="Map_Extinction">灭绝地图(Extinction)</sys:String>
<sys:String x:Key="Map_Valguero_P">瓦尔盖罗(Valguero)</sys:String>
<sys:String x:Key="Map_Ragnarok">仙境(Ragnarok)</sys:String>
<sys:String x:Key="Map_Aberration_P">畸变(Aberration)</sys:String>
<sys:String x:Key="Map_Extinction">灭绝(Extinction)</sys:String>
<sys:String x:Key="Map_Genesis">创世纪 1(Genesis: Part 1)</sys:String>
<sys:String x:Key="Map_Gen2">创世纪 2（Genesis: Part 2）</sys:String>
<sys:String x:Key="Map_TheCenter">中心岛(The Center)</sys:String>
<sys:String x:Key="Map_CrystalIsles">水晶岛(Crystal Isles)</sys:String>
<sys:String x:Key="Map_LostIsland">迷失岛(Lost Island)</sys:String>
<sys:String x:Key="Map_Fjordur">维京岛(Fjordur)</sys:String>
<sys:String x:Key="Map_Valguero_P">瓦尔盖罗(Valguero)</sys:String>
<sys:String x:Key="Map_ScorchedEarth_P">焦土地图(Scorched Earth)</sys:String>
<sys:String x:Key="Map_LostIsland">迷失岛(Lost Island)</sys:String>
<!--#endregion-->
<!--#region 总转换名称 -->
@ -823,7 +824,9 @@
<sys:String x:Key="GlobalSettings_Alerts_ServerStatusChangeTooltip">当服务器的状态发生变化时，将显示此消息。</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_ModUpdateDetectedLabel">检测到MOD更新：</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_ModUpdateDetectedTooltip">当服务器管理器检测到一个或多个mod已过期时，将显示此消息。</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_ForceRespawnDinosLabel">强制重生恐龙警告：</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_OnlinePlayerCountChangeLabel">在线玩家人数变化:</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_OnlinePlayerCountChangeTooltip">当在线玩家人数发生变化时，将显示此信息。</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_ForceRespawnDinosLabel">强制重生恐龙警告：</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_ForceRespawnDinosTooltip">当服务器启动并且安排了野生恐龙清除时，将显示此消息。</sys:String>
<!--#endregion-->
@ -959,11 +962,16 @@
<sys:String x:Key="ServerSettings_LastStartedLabel">最后开始时间:</sys:String>
<sys:String x:Key="ServerSettings_AvailabilityLabel">网络状态:</sys:String>
<sys:String x:Key="ServerSettings_AvailabilityTooltip">方舟服务器在Steam网络上的状态.</sys:String>
<sys:String x:Key="ServerSettings_Availability_Unknown">未知</sys:String>
<sys:String x:Key="ServerSettings_Availability_SetPublicIP">设置公网 IP</sys:String>
<sys:String x:Key="ServerSettings_Availability_Unavailable">不可用</sys:String>
<sys:String x:Key="ServerSettings_Availability_Waiting">等待发布</sys:String>
<sys:String x:Key="ServerSettings_Availability_UnavailableTootip">服务器无法访问</sys:String>
<sys:String x:Key="ServerSettings_Availability_LocalOnly">等待发布 - 仅限局域网访问</sys:String>
<sys:String x:Key="ServerSettings_Availability_LocalOnlyTootip">服务器只能通过本地IP在局域网内访问！一般是无公网IP或者端口映射转发问题！请检查是否有公网IP，或者检查端口是否开放！</sys:String>
<sys:String x:Key="ServerSettings_Availability_PublicOnly">可用 - 无回路</sys:String>
<sys:String x:Key="ServerSettings_Availability_PublicOnlyTootip">服务器可通过本地IP和公共IP访问、回路不可用！一般是因为公网IP动态更换后导致的！不用在意！重启或者等待几天即可！</sys:String>
<sys:String x:Key="ServerSettings_Availability_Available">可用</sys:String>
<sys:String x:Key="ServerSettings_Availability_AvailableTootip">通过本地IP和公共IP访问服务器</sys:String>
<sys:String x:Key="ServerSettings_PlayersLabel">在线玩家:</sys:String>
<sys:String x:Key="ServerSettings_PlayersTooltip">连接到方舟服务器的玩家数量.</sys:String>
@ -2336,18 +2344,18 @@
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_SaveTitle">地图恐龙刷新设置</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_DisableLabel">注意：如果要手动或者使用其他应用程序管理地图刷新覆盖，可以禁用此服务器管理器地图刷新覆盖。 详情在右上角全局设置“启用地图刷新设置”选项。</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_ContainerTypeColumnLabel">类型</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_ContainerTypeColumnLabel">类型（增加、减去、覆盖）</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_ContainerTypeColumnTooltip">恐龙刷新重写类型</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_ContainerClassColumnLabel">恐龙刷新</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_ContainerClassColumnTooltip">恐龙刷新类字符串</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_ContainerClassColumnLabel">恐龙刷新区域</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_ContainerClassColumnTooltip">恐龙刷新类地区</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryNameColumnLabel">名称</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryNameColumnLabel">恐龙名称</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryNameColumnTooltip">恐龙刷新的名称</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryClassColumnLabel">恐龙</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryClassColumnLabel">恐龙ID</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryClassColumnTooltip">要添加的恐龙ID</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryWeightClassColumnLabel">重量</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryWeightClassColumnLabel">恐龙刷新数量</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryWeightClassColumnTooltip">此恐龙刷新数量</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryMaxPercentageColumnLabel">最大百分比</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryMaxPercentageColumnLabel">最大允许刷新的百分比</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_EntryMaxPercentageColumnTooltip">设置此实例的最大允许恐龙和生物</sys:String>
<sys:String x:Key="ServerSettings_MapSpawnerOverrides_AddContainerTooltip">添加地图生成容器</sys:String>
@ -3097,6 +3105,11 @@
<sys:String x:Key="CrystalWyvern_Character_BP_WS_C">热带水晶飞龙</sys:String>
<sys:String x:Key="Tropeognathus_Character_BP_C">喷气翼龙</sys:String>
<sys:String x:Key="HoneyBee_Character_BP_C">巨蜂</sys:String>
<sys:String x:Key="CrystalWyvern_Character_BP_Minion_Blood_C">血色水晶飞龙</sys:String>
<sys:String x:Key="CrystalWyvern_Character_BP_C">水晶双足飞龙</sys:String>
<sys:String x:Key="CrystalWyvern_Character_BP_Minion_Ember_C">水晶灰烬黄金飞龙</sys:String>
<sys:String x:Key="CrystalWyvern_Character_BP_Minion_WS_C">热带水晶双足飞龙</sys:String>
<!--#endregion-->
<!--#region 恐龙/生物类名-水晶岛-BOSS -->
@ -5470,21 +5483,6 @@
<sys:String x:Key="PrimalItem_BossTribute_LostIsland_Medium_C">恐狒BOSS战利品(困难)(迷失岛)</sys:String>
<!--#endregion-->
<!--#region 项目类别名称 - 新增（唯一集成模组） -->
<sys:String x:Key="PrimalItem_xidianka_Weiyi_C">恐龙洗点卡</sys:String>
<sys:String x:Key="PrimalItem_TEK_unlock_Weiyi_C">泰克一键解锁</sys:String>
<sys:String x:Key="PrimalItem_TurretZD_Weiyi_C">炮塔终端</sys:String>
<sys:String x:Key="PrimalItem_shengjika_Weiyi_C">恐龙自定义等级升级卡</sys:String>
<sys:String x:Key="PrimalItem_unlock_Weiyi_C">一键解锁</sys:String>
<sys:String x:Key="PrimalItem_Adminzhaozi_C">小姐姐保护罩</sys:String>
<sys:String x:Key="PrimalItem_chibang_weiyi_C">管理员翅膀</sys:String>
<sys:String x:Key="PrimalItem_Fly_weiyi_C">飞行背包</sys:String>
<sys:String x:Key="PrimalItem_jinshou_weiyi_C">金手指 2.0</sys:String>
<sys:String x:Key="PrimalItem_lihe_weiyi_C">抽奖礼盒1</sys:String>
<sys:String x:Key="PrimalItem_lihe2_weiyi_C">抽奖礼盒2</sys:String>
<sys:String x:Key="PrimalItem_mubei_weiyi_C">墓碑</sys:String>
<sys:String x:Key="PrimalItem_xinshoubao_weiyi_C">新手礼包</sys:String>
<!--#endregion-->
<!--#region 地图生物生成 -->

2
src/ARKServerManager/Lib/ServerRCON.cs
View file

@ -471,7 +471,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/ARKServerManager/UserControls/GlobalSettingsControl.xaml
View file

@ -357,8 +357,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/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
View file

@ -919,7 +919,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}");

12
src/ARKServerManager/VersionFeed.xml
View file

@ -5,14 +5,14 @@
<title>Ark Server Manager Version Feed</title>
<subtitle>This is the Ark Server Manager release version feed.</subtitle>
<link href="https://arkservermanager.freeforums.net/" />
<updated>2022-07-21T00:00:00Z</updated>
<updated>2022-07-25T00:00:00Z</updated>
<entry>
<id>urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B</id>
<title>1.1.436 (1.1.436.3)</title>
<summary>1.1.436.3</summary>
<title>1.1.436 (1.1.436.4)</title>
<summary>1.1.436.4</summary>
<link href="" />
<updated>2022-07-21T00: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,13 +20,15 @@
<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>
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>ru-RU Translation file updated.</li>
<li>tr-TR Translation file updated.</li>
<li>zh-CN Translation file updated.</li>
</ul>
</p>
</div>

30
src/ARKServerManager/VersionFeedBeta.xml
View file

@ -5,7 +5,35 @@
<title>Ark Server Manager Version Feed</title>
<subtitle>This is the Ark Server Manager beta version feed.</subtitle>
<link href="https://arkservermanager.freeforums.net/" />
<updated>2022-07-21T00:00:00Z</updated>
<updated>2022-07-25T00:00:00Z</updated>
<entry>
<id>urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B</id>
<title>1.1.436 (1.1.436.4)</title>
<summary>1.1.436.4</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>
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>zh-CN Translation file updated.</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/ARKServerManager/Windows/WorkshopFilesWindow.xaml.cs
View file

@ -173,11 +173,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

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