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

Browse Source
This commit is contained in:
John Cardinal
2021-12-27 23:39:56 +00:00
parent 68332a7290
commit 09538483d3
4 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@@ -40,8 +40,8 @@
"env": { "env": {
// "ASPNETCORE_ENVIRONMENT": "Development", // "ASPNETCORE_ENVIRONMENT": "Development",
"AYANOVA_JWT_SECRET": "1111111MyRandom32CharacterSecret", "AYANOVA_JWT_SECRET": "1111111MyRandom32CharacterSecret",
"AYANOVA_LOG_LEVEL": "Info", //"AYANOVA_LOG_LEVEL": "Info",
//"AYANOVA_LOG_LEVEL": "Debug", "AYANOVA_LOG_LEVEL": "Debug",
// // "AYANOVA_LOG_LEVEL": "Trace", // // "AYANOVA_LOG_LEVEL": "Trace",
"AYANOVA_DEFAULT_TRANSLATION": "en", "AYANOVA_DEFAULT_TRANSLATION": "en",
"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;", "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;",

9
server/AyaNova/Controllers/ReportController.cs
View File

@@ -267,21 +267,22 @@ namespace AyaNova.Api.Controllers
return Accepted(new { JobId = result }); return Accepted(new { JobId = result });
} }
/// <summary> /// <summary>
/// Attempt cancel render job /// Attempt cancel render job
/// </summary> /// </summary>
/// <param name="gid"></param> /// <param name="gid"></param>
/// <returns>nothing</returns> /// <returns>nothing</returns>
[HttpGet("request-cancel/{gid}")] [HttpPost("request-cancel/{gid}")]
public async Task<IActionResult> RequestCancelJob([FromRoute] Guid gid) public async Task<IActionResult> RequestCancelJob([FromRoute] Guid gid)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
ReportBiz biz = ReportBiz.GetBiz(ct, HttpContext); ReportBiz biz = ReportBiz.GetBiz(ct, HttpContext);
if (!Authorized.HasReadFullRole(HttpContext.Items, biz.BizType)) if (!Authorized.HasReadFullRole(HttpContext.Items, biz.BizType))
return StatusCode(403, new ApiNotAuthorizedResponse()); return StatusCode(403, new ApiNotAuthorizedResponse());
if (!ModelState.IsValid) if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState)); return BadRequest(new ApiErrorResponse(ModelState));
log.LogDebug($"request-cancel called for report rendering job id {gid}");
await biz.CancelJob(gid); await biz.CancelJob(gid);
return NoContent(); return NoContent();
} }

4
server/AyaNova/biz/ReportBiz.cs
View File

@@ -1306,7 +1306,7 @@ namespace AyaNova.Biz
await browser.CloseAsync(); await browser.CloseAsync();
} }
log.LogDebug($"Calling ReportRenderManager.RemoveJob to stop tracking this job/process"); log.LogDebug($"Calling ReportRenderManager.RemoveJob to stop tracking this job/process");
await ReportRenderManager.RemoveJob(job.GId, log); await ReportRenderManager.RemoveJob(job.GId, log, false);
} }
} }
@@ -1321,7 +1321,7 @@ namespace AyaNova.Biz
public async Task CancelJob(Guid jobId) public async Task CancelJob(Guid jobId)
{ {
await ReportRenderManager.RemoveJob(jobId, AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::CancelJob")); await ReportRenderManager.RemoveJob(jobId, AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::CancelJob"), true);
} }
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////
//JOB / OPERATIONS //JOB / OPERATIONS

41
server/AyaNova/util/ReportProcessManager.cs
View File

@@ -45,19 +45,34 @@ namespace AyaNova.Util
if (i.Expires < dtNow) if (i.Expires < dtNow)
{ {
log.LogDebug($"attempting close of expired process {i.ReporterProcessId} for job {i.JobId}"); log.LogDebug($"attempting close of expired process {i.ReporterProcessId} for job {i.JobId}");
await CloseRenderProcess(i, log); await CloseRenderProcess(i, log, true);
} }
} }
} }
internal static async Task<bool> CloseRenderProcess(ReportRenderInstanceInfo instance, ILogger log) internal static async Task<bool> CloseRenderProcess(ReportRenderInstanceInfo instance, ILogger log, bool force)
{ {
log.LogDebug($"ForceCloseProcess on report render instance id {instance.ReporterProcessId} expired {instance.Expires.ToString()} utc"); if (force)
log.LogDebug($"Force CloseRenderProcess on report render instance id {instance.ReporterProcessId} expiry {instance.Expires.ToString()} utc");
else
log.LogDebug($"Normal CloseRenderProcess on report render instance id {instance.ReporterProcessId}");
try try
{ {
//either way, clear the job so the client gets informed //either way, clear the job so the client gets informed
await JobsBiz.LogJobAsync(instance.JobId, $"rendererror:timeout,{ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT}");//parseable for print client if (force)
await JobsBiz.UpdateJobStatusAsync(instance.JobId, JobStatus.Failed); {
if (instance.Expires < DateTime.UtcNow)
{
await JobsBiz.LogJobAsync(instance.JobId, $"rendererror:timeout,{ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT}");//parseable for print client
await JobsBiz.UpdateJobStatusAsync(instance.JobId, JobStatus.Failed);
}
else
{
await JobsBiz.LogJobAsync(instance.JobId, $"rendererror:cancelled");
await JobsBiz.UpdateJobStatusAsync(instance.JobId, JobStatus.Completed);
}
}
if (instance.ReporterProcessId != -1)//if a job doesn't have a process id yet it will be -1 if (instance.ReporterProcessId != -1)//if a job doesn't have a process id yet it will be -1
{ {
@@ -114,13 +129,13 @@ namespace AyaNova.Util
} }
} }
internal static async Task RemoveJob(Guid jobId, ILogger log) internal static async Task RemoveJob(Guid jobId, ILogger log, bool force)
{ {
foreach (var i in _baginstances) foreach (var i in _baginstances)
{ {
if (i.JobId == jobId) if (i.JobId == jobId)
{ {
await CloseRenderProcess(i, log); await CloseRenderProcess(i, log, force);
break; break;
} }
} }
@@ -139,17 +154,7 @@ namespace AyaNova.Util
return false; return false;
} }
internal static async Task RemoveProcess(int processId, ILogger log)
{
foreach (var i in _baginstances)
{
if (i.ReporterProcessId == processId)
{
await CloseRenderProcess(i, log);
break;
}
}
}
}//eoc }//eoc
}//eons }//eons