This commit is contained in:
2021-12-28 18:08:46 +00:00
parent 3faac9cdc9
commit c5756d0079

View File

@@ -788,7 +788,8 @@ namespace AyaNova.Biz
await browser.CloseAsync(); await browser.CloseAsync();
log.LogDebug($"Render completed successfully, output filename is: {outputFileName}, logging to job for client"); log.LogDebug($"Render completed successfully, output filename is: {outputFileName}, logging to job for client");
await JobsBiz.LogJobAsync(job.GId, $"{{\"reportfilename\":\"{outputFileName}\"}}"); var json = Newtonsoft.Json.JsonConvert.SerializeObject(new { reportfilename = outputFileName }, Newtonsoft.Json.Formatting.None);
await JobsBiz.LogJobAsync(job.GId, json);
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Completed);
return; return;
} }
@@ -850,7 +851,7 @@ namespace AyaNova.Biz
static async Task HandleTimeOut(OpsJob job, ILogger log, DataListReportRequest reportRequest, string userName) static async Task HandleTimeOut(OpsJob job, ILogger log, DataListReportRequest reportRequest, string userName)
{ {
log.LogDebug($"Report render cancelled by user OR exceeded timeout setting of {ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT} minutes, report id: {reportRequest.ReportId}, record count:{reportRequest.SelectedRowIds.LongLength}, user:{userName}"); log.LogDebug($"Report render cancelled by user OR exceeded timeout setting of {ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT} minutes, report id: {reportRequest.ReportId}, record count:{reportRequest.SelectedRowIds.LongLength}, user:{userName}");
var json = Newtonsoft.Json.JsonConvert.SerializeObject(new { rendererror = new { timeout = true,timeoutsetting= ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT} }, Newtonsoft.Json.Formatting.None); var json = Newtonsoft.Json.JsonConvert.SerializeObject(new { rendererror = new { timeout = true, timeoutsetting = ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT } }, Newtonsoft.Json.Formatting.None);
await JobsBiz.LogJobAsync(job.GId, json); await JobsBiz.LogJobAsync(job.GId, json);
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Failed); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Failed);