diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs index 5b63c656..218377e6 100644 --- a/server/AyaNova/biz/ReportBiz.cs +++ b/server/AyaNova/biz/ReportBiz.cs @@ -846,6 +846,7 @@ namespace AyaNova.Biz { 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); + //"{\"rendererror\":{\"timeout\":1}}" await JobsBiz.LogJobAsync(job.GId, json); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Failed); diff --git a/server/AyaNova/util/ReportProcessManager.cs b/server/AyaNova/util/ReportProcessManager.cs index 4e35b9d4..1a19760d 100644 --- a/server/AyaNova/util/ReportProcessManager.cs +++ b/server/AyaNova/util/ReportProcessManager.cs @@ -64,12 +64,14 @@ namespace AyaNova.Util { if (instance.Expires < DateTime.UtcNow) { - await JobsBiz.LogJobAsync(instance.JobId, $"rendererror:timeout,{ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT}");//parseable for print client + var json = Newtonsoft.Json.JsonConvert.SerializeObject(new { rendererror = new { timeout = true, timeoutsetting = ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT } }, Newtonsoft.Json.Formatting.None); + await JobsBiz.LogJobAsync(instance.JobId, json); await JobsBiz.UpdateJobStatusAsync(instance.JobId, JobStatus.Failed); } else { - await JobsBiz.LogJobAsync(instance.JobId, $"rendererror:cancelled"); + var json = Newtonsoft.Json.JsonConvert.SerializeObject(new { rendererror = new { cancelled = true} }, Newtonsoft.Json.Formatting.None); + await JobsBiz.LogJobAsync(instance.JobId, json); await JobsBiz.UpdateJobStatusAsync(instance.JobId, JobStatus.Completed); } }