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-28 17:56:28 +00:00
parent 3f8c5b80bb
commit 3faac9cdc9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -815,12 +815,12 @@ namespace AyaNova.Biz
{
log.LogInformation($"Exception caught while rendering report \"{report.Name}\", report Page console log:");
log.LogInformation(PageLog.ToString());
var json = Newtonsoft.Json.JsonConvert.SerializeObject(new { renderError = new { pagelog = PageLog.ToString(), exception = ExceptionUtil.ExtractAllExceptionMessages(ex) } }, Newtonsoft.Json.Formatting.None);
var json = Newtonsoft.Json.JsonConvert.SerializeObject(new { rendererror = new { pagelog = PageLog.ToString(), exception = ExceptionUtil.ExtractAllExceptionMessages(ex) } }, Newtonsoft.Json.Formatting.None);
await JobsBiz.LogJobAsync(job.GId, json);
}
else
{
var json = Newtonsoft.Json.JsonConvert.SerializeObject(new { renderError = new { exception = ExceptionUtil.ExtractAllExceptionMessages(ex) } }, Newtonsoft.Json.Formatting.None);
var json = Newtonsoft.Json.JsonConvert.SerializeObject(new { rendererror = new { exception = ExceptionUtil.ExtractAllExceptionMessages(ex) } }, Newtonsoft.Json.Formatting.None);
await JobsBiz.LogJobAsync(job.GId, json);
}
@@ -850,7 +850,7 @@ namespace AyaNova.Biz
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}");
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.UpdateJobStatusAsync(job.GId, JobStatus.Failed);