From d07e1367c8791d2309e7a3b29b20f9a3a2b9fa91 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 30 Sep 2022 23:56:40 +0000 Subject: [PATCH] case 4204 --- server/AyaNova/util/FileUtil.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/AyaNova/util/FileUtil.cs b/server/AyaNova/util/FileUtil.cs index 8ea5c0d3..c93e9228 100644 --- a/server/AyaNova/util/FileUtil.cs +++ b/server/AyaNova/util/FileUtil.cs @@ -326,9 +326,11 @@ namespace AyaNova.Util internal static void DatabaseBackupCleanUp(int keepCount) { if (keepCount < 1) keepCount = 1; + + //case 4204 prepended db and at with * to accomodate manual backups also being pruned //Database backups - var BackupFileList = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_BACKUP_FILES_PATH, "db-*.backup"); + var BackupFileList = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_BACKUP_FILES_PATH, "*db-*.backup"); if (BackupFileList.Count() > keepCount) { //sort, skip newest x (keepcount) delete the rest @@ -341,7 +343,7 @@ namespace AyaNova.Util } //Attachment backups - BackupFileList = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_BACKUP_FILES_PATH, "at-*.zip"); + BackupFileList = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_BACKUP_FILES_PATH, "*at-*.zip"); if (BackupFileList.Count() > keepCount) { //sort, skip newest x (keepcount) delete the rest @@ -353,6 +355,8 @@ namespace AyaNova.Util } } + + } internal static long BackupFilesDriveAvailableSpace()