Fixing report timeout error message problem recently introduced when changed timeout process
This commit is contained in:
@@ -166,9 +166,17 @@ export default {
|
||||
//check for any terminal status
|
||||
if (jobStatus != 1 && jobStatus != 2) {
|
||||
this.jobActive = false;
|
||||
// // eslint-disable-next-line no-debugger
|
||||
// debugger;
|
||||
const jobLogRes = await window.$gz.api.get(
|
||||
`job-operations/logs/${jobId}`
|
||||
);
|
||||
|
||||
console.log("report error", {
|
||||
jobStatus,
|
||||
jobLogRes
|
||||
});
|
||||
|
||||
//get final entry is error or success
|
||||
var finalJobLogMessage = jobLogRes.data[jobLogRes.data.length - 1];
|
||||
const finalJobLogObject = JSON.parse(finalJobLogMessage.statusText);
|
||||
@@ -181,6 +189,7 @@ export default {
|
||||
e = this.$ay.t("JobFailed");
|
||||
} else {
|
||||
//failure of some kind, either timeout, exception or exception plus pagelog
|
||||
|
||||
if (finalJobLogObject.rendererror.timeout) {
|
||||
//timeout
|
||||
await window.$gz.dialog.displayNoTranslationModalNotificationMessage(
|
||||
@@ -210,6 +219,10 @@ export default {
|
||||
throw new Error(e);
|
||||
}
|
||||
if (jobStatus == 3) {
|
||||
//success or cancelled
|
||||
|
||||
//todo handle cancelled type of completed
|
||||
//var json = Newtonsoft.Json.JsonConvert.SerializeObject(new { rendererror = new { cancelled = true} }, Newtonsoft.Json.Formatting.None);
|
||||
if (!finalJobLogObject.reportfilename) {
|
||||
throw new Error(
|
||||
`${this.$ay.t(
|
||||
|
||||
Reference in New Issue
Block a user