admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split out backup settings from general ops settings

Browse Source
This commit is contained in:
John Cardinal
2020-05-21 21:19:34 +00:00
parent 8b778be04b
commit f239e1605e
9 changed files with 87 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/AyaNova/generator/CoreJobBackup.cs
View File

@@ -32,7 +32,7 @@ namespace AyaNova.Biz
log.LogTrace("Checking if backup should run");
//what time should we backup today?
DateTime todayBackupTime = new DateTime(utcNow.Year, utcNow.Month, utcNow.Day, ServerGlobalOpsSettings.BackupTime.Hour, ServerGlobalOpsSettings.BackupTime.Minute, 0, DateTimeKind.Utc);//first start with NOW
DateTime todayBackupTime = new DateTime(utcNow.Year, utcNow.Month, utcNow.Day, ServerGlobalOpsSettingsCache.Backup.BackupTime.Hour, ServerGlobalOpsSettingsCache.Backup.BackupTime.Minute, 0, DateTimeKind.Utc);//first start with NOW
//Are we there yet?
if (utcNow < todayBackupTime)
{
@@ -41,7 +41,7 @@ namespace AyaNova.Biz
//Yes, we've passed into the backup window time, but that's also true if we just ran the backup as well so
//need to check for that as well...
//Has last backup run more than 24 hours ago?
if (ServerGlobalOpsSettings.LastBackup > utcNow.AddHours(-24))
if (ServerGlobalOpsSettingsCache.Backup.LastBackup > utcNow.AddHours(-24))
{
log.LogTrace("Hasn't been 24 hours since last backup yet"); return;//nope//nope, so we have already run today's backup
}
@@ -84,15 +84,15 @@ namespace AyaNova.Biz
//PRUNE DATA BACKUP SETS NOT KEPT
FileUtil.DatabaseBackupCleanUp(ServerGlobalOpsSettings.BackupSetsToKeep);
FileUtil.DatabaseBackupCleanUp(ServerGlobalOpsSettingsCache.Backup.BackupSetsToKeep);
//DO FILE BACKUP IF ATTACHMENTS BACKED UP
if (ServerGlobalOpsSettings.BackupAttachments)
if (ServerGlobalOpsSettingsCache.Backup.BackupAttachments)
FileUtil.BackupAttachments();
//PRUNE DATA BACKUP SETS NOT KEPT
FileUtil.AttachmentBackupCleanUp(ServerGlobalOpsSettings.BackupSetsToKeep);
FileUtil.AttachmentBackupCleanUp(ServerGlobalOpsSettingsCache.Backup.BackupSetsToKeep);
@@ -102,7 +102,7 @@ namespace AyaNova.Biz
if (!OnDemand)
{
//Update last backup
var biz = GlobalOpsSettingsBiz.GetBiz(ct);
var biz = GlobalOpsBackupSettingsBiz.GetBiz(ct);
var OpSet = await biz.GetAsync(false);
OpSet.LastBackup = utcNow;
await biz.ReplaceAsync(OpSet);