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-10-28 18:27:55 +00:00
parent ae4f09cc61
commit d446fafa58
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/launch.json vendored
View File

@@ -50,8 +50,8 @@
"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;",
//"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=abraxis;Database=AyaNova;CommandTimeout=120;", //"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=abraxis;Database=AyaNova;CommandTimeout=120;",
"AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_USE_URLS": "http://*:7575;",
"AYANOVA_REPORT_RENDERING_TIMEOUT": "20000", //"AYANOVA_REPORT_RENDERING_TIMEOUT": "20000",
"AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3", //"AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3",
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",

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

@@ -417,7 +417,7 @@ namespace AyaNova.Biz
//Default timeout for each operation of report generation //Default timeout for each operation of report generation
var WaitTimeout = new WaitForFunctionOptions() { Timeout = ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT }; // var WaitTimeout = new WaitForFunctionOptions() { Timeout = ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT*10 };
//includeWoItemDescendants? //includeWoItemDescendants?
reportRequest.IncludeWoItemDescendants = report.IncludeWoItemDescendants; reportRequest.IncludeWoItemDescendants = report.IncludeWoItemDescendants;
@@ -493,6 +493,8 @@ namespace AyaNova.Biz
//track this process so it can be cancelled if it times out //track this process so it can be cancelled if it times out
ReportRenderManager.AddProcess(browser.Process.Id); ReportRenderManager.AddProcess(browser.Process.Id);
page.DefaultTimeout = 0;//infinite timeout as we are controlling how long the process can live for with the reportprocessmanager
try try
{ {
@@ -611,7 +613,7 @@ namespace AyaNova.Biz
log.LogDebug($"Calling ayPreRender..."); log.LogDebug($"Calling ayPreRender...");
//PRE_RENDER WITH TIMEOUT //PRE_RENDER WITH TIMEOUT
await page.WaitForExpressionAsync($"ayPreRender({ReportDataObject})", WaitTimeout); await page.WaitForExpressionAsync($"ayPreRender({ReportDataObject})");
//compile the template //compile the template
log.LogDebug($"Calling Handlebars.compile..."); log.LogDebug($"Calling Handlebars.compile...");