diff --git a/server/generator/CoreJobBackup.cs b/server/generator/CoreJobBackup.cs index 81a61b4..c0c1600 100644 --- a/server/generator/CoreJobBackup.cs +++ b/server/generator/CoreJobBackup.cs @@ -56,7 +56,7 @@ namespace Sockeye.Biz DateTime dtStartBackup = DateTime.Now; log.LogDebug("Backup starting"); - var DemandFileNamePrepend = OnDemand ? "manual-" : string.Empty; + //var DemandFileNamePrepend = OnDemand ? "manual-" : string.Empty; //************* //DO DATA BACKUP //build command @@ -67,7 +67,7 @@ namespace Sockeye.Biz Npgsql.NpgsqlConnectionStringBuilder PostgresConnectionString = new Npgsql.NpgsqlConnectionStringBuilder(ServerBootConfig.SOCKEYE_DB_CONNECTION); var DBNameParameter = $"--dbname=postgresql://{PostgresConnectionString.Username}:{PostgresConnectionString.Password}@{PostgresConnectionString.Host}:{PostgresConnectionString.Port}/{PostgresConnectionString.Database}"; - var DataBackupFile = $"{DemandFileNamePrepend}db-{FileUtil.GetSafeDateFileName()}.backup";//presentation issue so don't use UTC for this one + var DataBackupFile = $"db-{FileUtil.GetSafeDateFileName()}.backup";//presentation issue so don't use UTC for this one DataBackupFile = FileUtil.GetFullPathForBackupFile(DataBackupFile); var BackupUtilityCommand = "pg_dump"; @@ -108,7 +108,7 @@ namespace Sockeye.Biz if (ServerGlobalOpsSettingsCache.Backup.BackupAttachments) { await JobsBiz.LogJobAsync(Guid.Empty, $"LT:Backup LT:Attachments"); - FileUtil.BackupAttachments(DemandFileNamePrepend); + FileUtil.BackupAttachments(); log.LogDebug("Backup of file attachments completed OK"); } diff --git a/server/util/FileUtil.cs b/server/util/FileUtil.cs index 0b84b2d..b65474a 100644 --- a/server/util/FileUtil.cs +++ b/server/util/FileUtil.cs @@ -588,11 +588,11 @@ namespace Sockeye.Util } - internal static void BackupAttachments(string demandFileNamePrepend, ILogger log = null) + internal static void BackupAttachments( ILogger log = null) { try { - var AttachmentsBackupFile = $"{demandFileNamePrepend}at-{FileUtil.GetSafeDateFileName()}.zip";//presentation issue so don't use UTC for this one + var AttachmentsBackupFile = $"at-{FileUtil.GetSafeDateFileName()}.zip";//presentation issue so don't use UTC for this one AttachmentsBackupFile = GetFullPathForBackupFile(AttachmentsBackupFile); System.IO.Compression.ZipFile.CreateFromDirectory(ServerBootConfig.SOCKEYE_ATTACHMENT_FILES_PATH, AttachmentsBackupFile);