From 96ba2c3474e29620c709f63ae388c692e7285527 Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Mon, 25 Jul 2022 09:39:30 +1000 Subject: [PATCH] Logging Bug - added data check when configuring logging. - removed workshop interval expiry options. - removed RCON password from logs. --- src/ARKServerManager/App.config | 3 - src/ARKServerManager/App.xaml.cs | 3 + src/ARKServerManager/Config.Designer.cs | 12 ---- src/ARKServerManager/Config.settings | 3 - .../Globalization/en-US/en-US.xaml | 2 - .../Globalization/zh-CN/zh-CN.xaml | 62 +++++++++---------- src/ARKServerManager/Lib/ServerRCON.cs | 2 +- .../UserControls/GlobalSettingsControl.xaml | 2 - .../ServerSettingsControl.xaml.cs | 1 - src/ARKServerManager/VersionFeed.xml | 12 ++-- src/ARKServerManager/VersionFeedBeta.xml | 30 ++++++++- .../Windows/WorkshopFilesWindow.xaml.cs | 5 -- src/ConanServerManager/App.config | 3 - src/ConanServerManager/App.xaml.cs | 3 + src/ConanServerManager/Config.Designer.cs | 12 ---- src/ConanServerManager/Config.settings | 3 - .../Globalization/en-US/en-US.xaml | 2 - src/ConanServerManager/Lib/ServerRcon.cs | 2 +- .../UserControls/GlobalSettingsControl.xaml | 2 - .../ServerSettingsControl.xaml.cs | 1 - src/ConanServerManager/VersionFeed.xml | 9 +-- src/ConanServerManager/VersionFeedBeta.xml | 25 +++++++- .../Windows/WorkshopFilesWindow.xaml.cs | 5 -- 23 files changed, 103 insertions(+), 101 deletions(-) diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config index e4fa4128..09547b9e 100644 --- a/src/ARKServerManager/App.config +++ b/src/ARKServerManager/App.config @@ -558,9 +558,6 @@ False - - 168 - False diff --git a/src/ARKServerManager/App.xaml.cs b/src/ARKServerManager/App.xaml.cs index 26cdd66d..e7603044 100644 --- a/src/ARKServerManager/App.xaml.cs +++ b/src/ARKServerManager/App.xaml.cs @@ -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); diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs index bb48af64..19f9eea0 100644 --- a/src/ARKServerManager/Config.Designer.cs +++ b/src/ARKServerManager/Config.Designer.cs @@ -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")] diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings index 028fd1a4..db6412d8 100644 --- a/src/ARKServerManager/Config.settings +++ b/src/ARKServerManager/Config.settings @@ -362,9 +362,6 @@ False - - 168 - Server diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml index 59b93a3f..adf6f0b6 100644 --- a/src/ARKServerManager/Globalization/en-US/en-US.xaml +++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml @@ -620,8 +620,6 @@ 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. Force mod file downloads when no steam information available If enabled, the mods will be downloaded from steam even when no steam information is available. - Workshop Cache Expiry - 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. Backup Settings Include the SaveGames folder when performing a WorldSave backup diff --git a/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml b/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml index 76036af3..31ab7cdd 100644 --- a/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml +++ b/src/ARKServerManager/Globalization/zh-CN/zh-CN.xaml @@ -15,17 +15,18 @@ 孤岛(The Island) - 中心岛地图(The Center) - 焦土地图(Scorched Earth) - 仙境地图(Ragnarok) - 畸变地图(Aberration) - 灭绝地图(Extinction) - 瓦尔盖罗(Valguero) + 仙境(Ragnarok) + 畸变(Aberration) + 灭绝(Extinction) 创世纪 1(Genesis: Part 1) 创世纪 2（Genesis: Part 2） + 中心岛(The Center) 水晶岛(Crystal Isles) - 迷失岛(Lost Island) 维京岛(Fjordur) + 瓦尔盖罗(Valguero) + 焦土地图(Scorched Earth) + 迷失岛(Lost Island) + @@ -823,7 +824,9 @@ 当服务器的状态发生变化时，将显示此消息。 检测到MOD更新： 当服务器管理器检测到一个或多个mod已过期时，将显示此消息。 - 强制重生恐龙警告： + 在线玩家人数变化: + 当在线玩家人数发生变化时，将显示此信息。 + 强制重生恐龙警告： 当服务器启动并且安排了野生恐龙清除时，将显示此消息。 @@ -959,11 +962,16 @@ 最后开始时间: 网络状态: 方舟服务器在Steam网络上的状态. + 未知 - 设置公网 IP 不可用 - 等待发布 + 服务器无法访问 + 等待发布 - 仅限局域网访问 + 服务器只能通过本地IP在局域网内访问！一般是无公网IP或者端口映射转发问题！请检查是否有公网IP，或者检查端口是否开放！ + 可用 - 无回路 + 服务器可通过本地IP和公共IP访问、回路不可用！一般是因为公网IP动态更换后导致的！不用在意！重启或者等待几天即可！ 可用 + 通过本地IP和公共IP访问服务器 在线玩家: 连接到方舟服务器的玩家数量. @@ -2336,18 +2344,18 @@ 地图恐龙刷新设置 注意：如果要手动或者使用其他应用程序管理地图刷新覆盖，可以禁用此服务器管理器地图刷新覆盖。 详情在右上角全局设置“启用地图刷新设置”选项。 - 类型 + 类型（增加、减去、覆盖） 恐龙刷新重写类型 - 恐龙刷新 - 恐龙刷新类字符串 + 恐龙刷新区域 + 恐龙刷新类地区 - 名称 + 恐龙名称 恐龙刷新的名称 - 恐龙 + 恐龙ID 要添加的恐龙ID - 重量 + 恐龙刷新数量 此恐龙刷新数量 - 最大百分比 + 最大允许刷新的百分比 设置此实例的最大允许恐龙和生物 添加地图生成容器 @@ -3097,6 +3105,11 @@ 热带水晶飞龙 喷气翼龙 巨蜂 + 血色水晶飞龙 + 水晶双足飞龙 + 水晶灰烬黄金飞龙 + 热带水晶双足飞龙 + @@ -5470,21 +5483,6 @@ 恐狒BOSS战利品(困难)(迷失岛) - - 恐龙洗点卡 - 泰克一键解锁 - 炮塔终端 - 恐龙自定义等级升级卡 - 一键解锁 - 小姐姐保护罩 - 管理员翅膀 - 飞行背包 - 金手指 2.0 - 抽奖礼盒1 - 抽奖礼盒2 - 墓碑 - 新手礼包 - diff --git a/src/ARKServerManager/Lib/ServerRCON.cs b/src/ARKServerManager/Lib/ServerRCON.cs index 6148c308..aae38a27 100644 --- a/src/ARKServerManager/Lib/ServerRCON.cs +++ b/src/ARKServerManager/Lib/ServerRCON.cs @@ -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 diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml index 43e3daac..e16be6ef 100644 --- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml @@ -357,8 +357,6 @@ - - diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs index 5b75fe8b..84adc532 100644 --- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs +++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs @@ -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}"); diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index a3fd80aa..36c19a1c 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -5,14 +5,14 @@ Ark Server Manager Version Feed This is the Ark Server Manager release version feed. - 2022-07-21T00:00:00Z + 2022-07-25T00:00:00Z urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B - 1.1.436 (1.1.436.3) - 1.1.436.3 + 1.1.436 (1.1.436.4) + 1.1.436.4 - 2022-07-21T00:00:00Z + 2022-07-25T00:00:00Z

@@ -20,13 +20,15 @@

  • Server Status - changed the server status code to stop the status cycling and to be more accurate.
    • -
  • 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.
    • +
  • 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.
    • +
  • Fixed a crash bug when trying to set the logging folder.
CHANGE
  • ru-RU Translation file updated.
  • tr-TR Translation file updated.
    • +
  • zh-CN Translation file updated.

diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index a8b41fb0..10ed4247 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -5,7 +5,35 @@ Ark Server Manager Version Feed This is the Ark Server Manager beta version feed. - 2022-07-21T00:00:00Z + 2022-07-25T00:00:00Z + + + urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B + 1.1.436 (1.1.436.4) + 1.1.436.4 + + 2022-07-25T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Fixed a crash bug when trying to set the logging folder.
    • +
+ CHANGE +
+
    +
  • zh-CN Translation file updated.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B diff --git a/src/ARKServerManager/Windows/WorkshopFilesWindow.xaml.cs b/src/ARKServerManager/Windows/WorkshopFilesWindow.xaml.cs index 99302807..2252abb0 100644 --- a/src/ARKServerManager/Windows/WorkshopFilesWindow.xaml.cs +++ b/src/ARKServerManager/Windows/WorkshopFilesWindow.xaml.cs @@ -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 diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config index add373f6..6154eb44 100644 --- a/src/ConanServerManager/App.config +++ b/src/ConanServerManager/App.config @@ -420,9 +420,6 @@ False - - 168 - Server shutdown has been cancelled. diff --git a/src/ConanServerManager/App.xaml.cs b/src/ConanServerManager/App.xaml.cs index bc6664ed..fb154042 100644 --- a/src/ConanServerManager/App.xaml.cs +++ b/src/ConanServerManager/App.xaml.cs @@ -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); diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs index 0d4c399f..d2b7858a 100644 --- a/src/ConanServerManager/Config.Designer.cs +++ b/src/ConanServerManager/Config.Designer.cs @@ -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")] diff --git a/src/ConanServerManager/Config.settings b/src/ConanServerManager/Config.settings index 67f0befc..8349b5f1 100644 --- a/src/ConanServerManager/Config.settings +++ b/src/ConanServerManager/Config.settings @@ -236,9 +236,6 @@ False - - 168 - server diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml index 54ec2898..e54bdc83 100644 --- a/src/ConanServerManager/Globalization/en-US/en-US.xaml +++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml @@ -777,8 +777,6 @@ 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. Force mod file downloads when no steam information available If enabled, the mods will be downloaded from steam even when no steam information is available. - Workshop Cache Expiry - 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. Backup Settings Include the SaveGames folder when performing a WorldSave backup diff --git a/src/ConanServerManager/Lib/ServerRcon.cs b/src/ConanServerManager/Lib/ServerRcon.cs index 8e46a233..36343cba 100644 --- a/src/ConanServerManager/Lib/ServerRcon.cs +++ b/src/ConanServerManager/Lib/ServerRcon.cs @@ -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 diff --git a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml index 23adb37f..2b49acbc 100644 --- a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml +++ b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml @@ -306,8 +306,6 @@ - - diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs index 12ebecd5..490dffe7 100644 --- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs +++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs @@ -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}"); diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index 6f042b38..fd69fc74 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -9,10 +9,10 @@ urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B - 1.1.79 (1.1.79.2) - 1.1.79.2 + 1.1.79 (1.1.79.3) + 1.1.79.3 - 2022-07-16T00:00:00Z + 2022-07-25T00:00:00Z

@@ -20,7 +20,8 @@

  • Server Status - changed the server status code to stop the status cycling and to be more accurate.
    • -
  • 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.
    • +
  • 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.
    • +
  • Fixed a crash bug when trying to set the logging folder.

diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index 09985a9e..ae4edfc5 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -5,7 +5,30 @@ Conan Server Manager Version Feed This is the Conan Server Manager beta version feed. - 2022-07-16T00:00:00Z + 2022-07-25T00:00:00Z + + + urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B + 1.1.79 (1.1.79.3) + 1.1.79.3 + + 2022-07-25T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Fixed a crash bug when trying to set the logging folder.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B diff --git a/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml.cs b/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml.cs index 7a2095e9..eb7c2755 100644 --- a/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml.cs +++ b/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml.cs @@ -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