🐛 Fix bug in own error-workflow addition

This commit is contained in:
Jan Oberhauser 2020-12-12 18:41:11 +01:00
parent 8b567c20b9
commit d306be8099

View file

@ -78,12 +78,15 @@ function executeErrorWorkflow(workflowData: IWorkflowBase, fullRunData: IRun, mo
name: workflowData.name, name: workflowData.name,
}, },
}; };
// Run the error workflow // Run the error workflow
if(workflowData.id !== undefined && workflowData.nodes.some((node) => node.type === ERROR_TRIGGER_TYPE)) { // To avoid an infinite loop do not run the error workflow again if the error-workflow itself failed and it is its own error-workflow.
WorkflowHelpers.executeErrorWorkflow(workflowData.id.toString(), workflowErrorData); if (workflowData.settings !== undefined && workflowData.settings.errorWorkflow && !(mode === 'error' && workflowData.settings.errorWorkflow.toString() === workflowData.id.toString())) {
} // If a specific error workflow is set run only that one
if(workflowData.settings !== undefined && workflowData.settings.errorWorkflow && workflowData.settings.errorWorkflow != workflowData.id) {
WorkflowHelpers.executeErrorWorkflow(workflowData.settings.errorWorkflow as string, workflowErrorData); WorkflowHelpers.executeErrorWorkflow(workflowData.settings.errorWorkflow as string, workflowErrorData);
} else if (mode !== 'error' && workflowData.id !== undefined && workflowData.nodes.some((node) => node.type === ERROR_TRIGGER_TYPE)) {
// If the workflow contains
WorkflowHelpers.executeErrorWorkflow(workflowData.id.toString(), workflowErrorData);
} }
} }
} }