From db6bbd3f7e934e7e632bee951acadb1f50f20ca9 Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Wed, 18 May 2022 23:08:39 +1000 Subject: [PATCH] Backup Interval Changes - The backup interval has been changed to use the value in the global settings. --- src/ARKServerManager/App.xaml.cs | 4 ++-- src/ARKServerManager/Lib/ServerApp.cs | 5 ++--- src/ARKServerManager/VersionFeed.xml | 5 +++-- src/ARKServerManager/VersionFeedBeta.xml | 23 ++++++++++++++++++++++ src/ConanServerManager/App.xaml.cs | 4 ++-- src/ConanServerManager/Lib/ServerApp.cs | 5 ++--- src/ConanServerManager/VersionFeed.xml | 5 +++-- src/ConanServerManager/VersionFeedBeta.xml | 23 ++++++++++++++++++++++ 8 files changed, 60 insertions(+), 14 deletions(-) diff --git a/src/ARKServerManager/App.xaml.cs b/src/ARKServerManager/App.xaml.cs index b159a917..c7f0be9e 100644 --- a/src/ARKServerManager/App.xaml.cs +++ b/src/ARKServerManager/App.xaml.cs @@ -583,8 +583,8 @@ namespace ServerManagerTool SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, includeBackup ? backupFolder : null); SettingsUtils.BackupUserConfigSettings(CommonConfig.Default, "commonconfig.json", installFolder, includeBackup ? backupFolder : null); - SettingsUtils.DeleteBackupUserConfigFiles("userconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL); - SettingsUtils.DeleteBackupUserConfigFiles("commonconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL); + SettingsUtils.DeleteBackupUserConfigFiles("userconfig.json", backupFolder, Config.Default.AutoBackup_DeleteInterval); + SettingsUtils.DeleteBackupUserConfigFiles("commonconfig.json", backupFolder, Config.Default.AutoBackup_DeleteInterval); } private void ShutDownApplication() diff --git a/src/ARKServerManager/Lib/ServerApp.cs b/src/ARKServerManager/Lib/ServerApp.cs index 1c6fdc75..091d84ee 100644 --- a/src/ARKServerManager/Lib/ServerApp.cs +++ b/src/ARKServerManager/Lib/ServerApp.cs @@ -35,7 +35,6 @@ namespace ServerManagerTool.Lib public const int MUTEX_TIMEOUT = 5; // 5 minutes public const int MUTEX_ATTEMPTDELAY = 5000; // 5 seconds - public const int BACKUP_DELETEINTERVAL = 7; // 7 days private const int STEAM_MAXRETRIES = 10; private const int RCON_MAXRETRIES = 3; @@ -1954,7 +1953,7 @@ namespace ServerManagerTool.Lib { try { - var deleteInterval = Config.Default.AutoBackup_EnableBackup ? Config.Default.AutoBackup_DeleteInterval : BACKUP_DELETEINTERVAL; + var deleteInterval = Config.Default.AutoBackup_DeleteInterval; LogProfileMessage(""); LogProfileMessage("Delete old profile backup files started..."); @@ -2177,7 +2176,7 @@ namespace ServerManagerTool.Lib { try { - var deleteInterval = Config.Default.AutoBackup_EnableBackup ? Config.Default.AutoBackup_DeleteInterval : BACKUP_DELETEINTERVAL; + var deleteInterval = Config.Default.AutoBackup_DeleteInterval; LogProfileMessage(""); LogProfileMessage("Delete old server backup files started..."); diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 656f0905..a2fc7ce5 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -9,8 +9,8 @@ urn:uuid:D0681B47-5715-473E-99D3-63F475A997C4 - 1.1.429 (1.1.429.1) - 1.1.429.1 + 1.1.429 (1.1.429.2) + 1.1.429.2 2022-05-18T00:00:00Z @@ -20,6 +20,7 @@
  • World Save Zipping - have changed the way the zip file is created. All files are now added to the zip in one pass, rather than as separate files.
    • +
  • Backup Interval Changes - The backup interval has been changed to use the value in the global settings, when auto-backup is enabled or not.

diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index e82abdc6..27ad3946 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2022-05-15T00:00:00Z + + urn:uuid:661C8C8B-B1DC-4368-95E7-A9C29C274B5B + 1.1.429 (1.1.429.2) + 1.1.429.2 + + 2022-05-18T00:00:00Z + +
+

+ CHANGE +
+

    +
  • Backup Interval Changes - The backup interval has been changed to use the value in the global settings, when auto-backup is enabled or not.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + + urn:uuid:D0681B47-5715-473E-99D3-63F475A997C4 1.1.429 (1.1.429.1) diff --git a/src/ConanServerManager/App.xaml.cs b/src/ConanServerManager/App.xaml.cs index 899282eb..394f166f 100644 --- a/src/ConanServerManager/App.xaml.cs +++ b/src/ConanServerManager/App.xaml.cs @@ -572,8 +572,8 @@ namespace ServerManagerTool SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, includeBackup ? backupFolder : null); SettingsUtils.BackupUserConfigSettings(CommonConfig.Default, "commonconfig.json", installFolder, includeBackup ? backupFolder : null); - SettingsUtils.DeleteBackupUserConfigFiles("userconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL); - SettingsUtils.DeleteBackupUserConfigFiles("commonconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL); + SettingsUtils.DeleteBackupUserConfigFiles("userconfig.json", backupFolder, Config.Default.AutoBackup_DeleteInterval); + SettingsUtils.DeleteBackupUserConfigFiles("commonconfig.json", backupFolder, Config.Default.AutoBackup_DeleteInterval); } private void ShutDownApplication() diff --git a/src/ConanServerManager/Lib/ServerApp.cs b/src/ConanServerManager/Lib/ServerApp.cs index af636dda..f5970635 100644 --- a/src/ConanServerManager/Lib/ServerApp.cs +++ b/src/ConanServerManager/Lib/ServerApp.cs @@ -36,7 +36,6 @@ namespace ServerManagerTool.Lib public const int MUTEX_TIMEOUT = 5; // 5 minutes public const int MUTEX_ATTEMPTDELAY = 5000; // 5 seconds - public const int BACKUP_DELETEINTERVAL = 7; // 7 days private const int STEAM_MAXRETRIES = 10; private const int RCON_MAXRETRIES = 3; @@ -1878,7 +1877,7 @@ namespace ServerManagerTool.Lib { try { - var deleteInterval = Config.Default.AutoBackup_EnableBackup ? Config.Default.AutoBackup_DeleteInterval : BACKUP_DELETEINTERVAL; + var deleteInterval = Config.Default.AutoBackup_DeleteInterval; LogProfileMessage(""); LogProfileMessage("Delete old profile backup files started..."); @@ -2075,7 +2074,7 @@ namespace ServerManagerTool.Lib { try { - var deleteInterval = Config.Default.AutoBackup_EnableBackup ? Config.Default.AutoBackup_DeleteInterval : BACKUP_DELETEINTERVAL; + var deleteInterval = Config.Default.AutoBackup_DeleteInterval; LogProfileMessage(""); LogProfileMessage("Delete old server backup files started..."); diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index d9c7852f..fa15324c 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -9,8 +9,8 @@ urn:uuid:D0681B47-5715-473E-99D3-63F475A997C4 - 1.1.73 (1.1.72.1) - 1.1.73.1 + 1.1.73 (1.1.72.2) + 1.1.73.2 2022-05-18T00:00:00Z @@ -20,6 +20,7 @@
  • World Save Zipping - have changed the way the zip file is created. All files are now added to the zip in one pass, rather than as separate files.
    • +
  • Backup Interval Changes - The backup interval has been changed to use the value in the global settings, when auto-backup is enabled or not.

diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index ecb63080..0245d82c 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2022-05-18T00:00:00Z + + urn:uuid:661C8C8B-B1DC-4368-95E7-A9C29C274B5B + 1.1.73 (1.1.72.2) + 1.1.73.2 + + 2022-05-18T00:00:00Z + +
+

+ CHANGE +
+

    +
  • Backup Interval Changes - The backup interval has been changed to use the value in the global settings, when auto-backup is enabled or not.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + + urn:uuid:D0681B47-5715-473E-99D3-63F475A997C4 1.1.73 (1.1.72.1)