From f9619913600530ffc3a2e8f85e7c6a2bdf35a5b0 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 28 Sep 2022 00:07:03 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/JobOperationsController.cs | 4 ++-- server/AyaNova/biz/CustomerBiz.cs | 2 ++ server/AyaNova/util/ServerBootConfig.cs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/AyaNova/Controllers/JobOperationsController.cs b/server/AyaNova/Controllers/JobOperationsController.cs index 4b25f0c0..1ffc4926 100644 --- a/server/AyaNova/Controllers/JobOperationsController.cs +++ b/server/AyaNova/Controllers/JobOperationsController.cs @@ -259,8 +259,8 @@ namespace AyaNova.Api.Controllers /// /// /// Accepted - [HttpPost("request-cancel/{gid}")] - public async Task RequestCancelJob([FromRoute] Guid gid) + [HttpPost("request-cancel")] + public async Task RequestCancelJob([FromBody] Guid gid) { if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs index c1d4d7e4..044679f1 100644 --- a/server/AyaNova/biz/CustomerBiz.cs +++ b/server/AyaNova/biz/CustomerBiz.cs @@ -617,6 +617,7 @@ namespace AyaNova.Biz { break; } + LastProgressCheck = DateTime.UtcNow; } SaveIt = false; @@ -664,6 +665,7 @@ namespace AyaNova.Biz await JobsBiz.LogJobAsync(job.GId, ExceptionUtil.ExtractAllExceptionMessages(ex)); } } + await JobsBiz.UpdateJobProgressAsync(job.GId, $"{++CurrentRecord}/{TotalRecords}"); await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {idList.Count}{(FailedObjectCount > 0 ? " - LT:Failed " + FailedObjectCount : "")}"); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); } diff --git a/server/AyaNova/util/ServerBootConfig.cs b/server/AyaNova/util/ServerBootConfig.cs index 6e9b4fec..7191f77e 100644 --- a/server/AyaNova/util/ServerBootConfig.cs +++ b/server/AyaNova/util/ServerBootConfig.cs @@ -16,7 +16,7 @@ namespace AyaNova.Util //STATIC HARD CODED COMPILE TIME DEFAULTS NOT SET THROUGH CONFIG internal const int FAILED_AUTH_DELAY = 3000;//ms internal const int JOB_OBJECT_HANDLE_BATCH_JOB_LOOP_DELAY = 200;//ms this delay is a temporary measure to ensure super big time consuming batch jobs don't use all server CPU resources - internal const int JOB_PROGRESS_UPDATE_AND_CANCEL_CHECK_SECONDS = 15;//seconds between progress updates and checks for cancellation of long running jobs + internal const int JOB_PROGRESS_UPDATE_AND_CANCEL_CHECK_SECONDS = 5;//seconds between progress updates and checks for cancellation of long running jobs //UPLOAD LIMITS 1048576 = 1MiB for testing 10737420000 10737418240 10,737,418,240 internal const long MAX_ATTACHMENT_UPLOAD_BYTES = 10737420000;//slight bit of overage as 10737418241=10GiB