From e6876bf5b9a0eeb8e290afb4d040bf79f596c304 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 7 Mar 2023 00:31:44 +0000 Subject: [PATCH] case 4460 --- docs/8.0/ayanova/docs/changelog.md | 9 ++++++++- server/AyaNova/util/FileUtil.cs | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/docs/8.0/ayanova/docs/changelog.md b/docs/8.0/ayanova/docs/changelog.md index 16091d01..fdbe2df7 100644 --- a/docs/8.0/ayanova/docs/changelog.md +++ b/docs/8.0/ayanova/docs/changelog.md @@ -14,6 +14,10 @@ See the [upgrade instructions](ops-upgrade.md) section of this manual for detail - Server: Fixed bug in Unit report data's "LastWorkOrderViz" field being set to incorrect value +#### Changed + +- Server: manual / on demand backup files no longer prepended with "manual-", named same as daily automated backups. Existing "manual-" files found will have the "manual-" portion removed when next backup runs. This resolves a potential issue with pruning of excess backup sets and removes potential confusion from lack of consistent naming. Docs updated to remove reference to "manual-" naming of backup sets. + #### Added - App: added `Quote w Travel Loan Item Expense Outside Service` report to available Quote reports as the original stock one left out some sections of the quote. @@ -21,6 +25,9 @@ See the [upgrade instructions](ops-upgrade.md) section of this manual for detail For existing databases [download Quote w Travel Loan Item Expense Outside Service](https://ayanova.com/download/xtra/Customer Quote w Travel Loan Item Expense Outside Service.ayrt) and [import to AyaNova](adm-report-templates.md#import). +- Docs: added [documentation page](sub-service-intro.md) for AyaNova subscription service on-boarding information + + ### AyaNova 8.0.35 (2023-01-27) #### Fixed @@ -31,7 +38,7 @@ See the [upgrade instructions](ops-upgrade.md) section of this manual for detail #### Added -- Server: added new [AYANOVA_REPORT_RENDER_API_URL_OVERRIDE](ops-config-report-rendering-api-url-override.md) configuration option for specific report rendering issue scenarios. +- Server: added new [AYANOVA_REPORT_RENDER_API_URL_OVERRIDE](ops-config-report-rendering-api-url-override.md) configuration option for specific report rendering issue scenarios ### AyaNova 8.0.33 (2023-01-24) diff --git a/server/AyaNova/util/FileUtil.cs b/server/AyaNova/util/FileUtil.cs index 15aeb1c0..dc346724 100644 --- a/server/AyaNova/util/FileUtil.cs +++ b/server/AyaNova/util/FileUtil.cs @@ -326,8 +326,17 @@ 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 + + //case 4460 rename manual- file pattern to support removal of manual- prepend on demand backup + //this ensures that pruning happens properly + var renameList = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_BACKUP_FILES_PATH, "manual-*"); + if (renameList.Count() > 0) + { + foreach (string renameFile in renameList) + { + File.Move(renameFile, renameFile.Replace("manual-", ""), true); + } + } //Database backups var BackupFileList = Directory.EnumerateFiles(ServerBootConfig.AYANOVA_BACKUP_FILES_PATH, "*db-*.backup"); @@ -355,7 +364,7 @@ namespace AyaNova.Util } } - + }