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
2022-03-07 22:58:03 +00:00
parent 86725413fc
commit 5f01dda11a
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -48,7 +48,7 @@
"AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_DATA_PATH": "c:\\temp\\ravendata",
"AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_USE_URLS": "http://*:7575;",
//"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true",
"AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE": "false",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8",
//"AYANOVA_REPORT_RENDERING_TIMEOUT":"1", //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",

5
server/AyaNova/biz/JobsBiz.cs
View File

@@ -211,8 +211,11 @@ namespace AyaNova.Biz
//BACKUP //BACKUP
await CoreJobBackup.DoWorkAsync(); await CoreJobBackup.DoWorkAsync();
if (!KeepOnWorking()) return; if (!KeepOnWorking()) return;
//NOTIFICATIONS //NOTIFICATIONS
await CoreJobNotify.DoWorkAsync(); TaskUtil.Forget(Task.Run(() => CoreJobNotify.DoWorkAsync()));
// await CoreJobNotify.DoWorkAsync();
if (!KeepOnWorking()) return; if (!KeepOnWorking()) return;
await CoreNotificationSweeper.DoWorkAsync(); await CoreNotificationSweeper.DoWorkAsync();
if (!KeepOnWorking()) return; if (!KeepOnWorking()) return;

11
server/AyaNova/generator/CoreJobNotify.cs
View File

@@ -447,15 +447,15 @@ namespace AyaNova.Biz
else else
{ {
bool done = false; bool done = false;
bool timedOut = false; DateTime bailAfter = DateTime.Now.AddMinutes(ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT);
//todo: need a timeout here that sets done as failed due to timeout while (!done && DateTime.Now < bailAfter)
while (!done && !timedOut)
{ {
var status = await JobsBiz.GetJobStatusAsync((Guid)jobid); var status = await JobsBiz.GetJobStatusAsync((Guid)jobid);
switch (status) switch (status)
{ {
case JobStatus.Completed: case JobStatus.Completed:
{ {
done = true;
//get job logs and parse file name from it //get job logs and parse file name from it
JobOperationsBiz jobopsbiz = new JobOperationsBiz(ct, 1, AuthorizationRoles.BizAdmin); JobOperationsBiz jobopsbiz = new JobOperationsBiz(ct, 1, AuthorizationRoles.BizAdmin);
List<JobOperationsLogInfoItem> log = await jobopsbiz.GetJobLogListAsync((Guid)jobid); List<JobOperationsLogInfoItem> log = await jobopsbiz.GetJobLogListAsync((Guid)jobid);
@@ -467,11 +467,14 @@ namespace AyaNova.Biz
break; break;
} }
case JobStatus.Failed: case JobStatus.Failed:
case JobStatus.Absent:
throw new ApplicationException($"REPORT RENDER JOB {jobid} started but failed"); throw new ApplicationException($"REPORT RENDER JOB {jobid} started but failed");
} }
} }
//throw new TimeoutException("JOB FAILED DUE TO REPORT RENDER TIMEOUT"); if (!done)
throw new TimeoutException("JOB FAILED DUE TO REPORT RENDER TIMEOUT");
} }
} }
else else