diff --git a/.vscode/launch.json b/.vscode/launch.json index 6b9a0d68..95c9b301 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -50,7 +50,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_METRICS_USE_INFLUXDB": "false", - "AYANOVA_SERVER_TEST_MODE":"true", + "AYANOVA_SERVER_TEST_MODE":"false", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL":"small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET":"-7", "AYANOVA_BACKUP_PG_DUMP_PATH":"C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\" diff --git a/server/AyaNova/generator/CoreJobBackup.cs b/server/AyaNova/generator/CoreJobBackup.cs index a1e8ecda..ee0c4071 100644 --- a/server/AyaNova/generator/CoreJobBackup.cs +++ b/server/AyaNova/generator/CoreJobBackup.cs @@ -69,13 +69,14 @@ namespace AyaNova.Biz var Arguments = $"{DBNameParameter} -Fc > {DataBackupFile}"; - + var RunCommand=$"\"{BackupUtilityCommand} {Arguments}\""; log.LogInformation("BACKUP STUB: DATA BACKUP RUNNING NOW - TORA TORA TORA!"); log.LogInformation($"CALLING BACKUP COMMAND: {BackupUtilityCommand} {Arguments}"); //RUN THE BACKUP - var Result = RunProgram.Run(BackupUtilityCommand, Arguments, log); + //var Result = RunProgram.Run(BackupUtilityCommand, Arguments, log); + var Result = RunProgram.Run(RunCommand,"", log); log.LogInformation($"BACKUP RESULT: {Result}"); diff --git a/server/AyaNova/models/GlobalOpsSettings.cs b/server/AyaNova/models/GlobalOpsSettings.cs index 22419d6e..ff51ab06 100644 --- a/server/AyaNova/models/GlobalOpsSettings.cs +++ b/server/AyaNova/models/GlobalOpsSettings.cs @@ -17,7 +17,7 @@ namespace AyaNova.Models Id = 1;//always 1 // BackupTime = new DateTime(2020, 5, 19, 23, 59, 0, DateTimeKind.Utc);//date doesn't matter it only uses hour //testing only, above is the correct one - BackupTime = DateTime.UtcNow.AddMinutes(1); + BackupTime = DateTime.UtcNow.AddMinutes(-10); LastBackup = DateTime.MinValue; BackupSetsToKeep = 3;