mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 12:57:29 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

⚡ Allow workflow to trigger on own error trigger (#1205)

Browse source 
* allow workflow to trigger on own error trigger

* use config errorTriggerType instance of a static string

* don't trigger twice
This commit is contained in:
lublak 2020-12-12 18:36:47 +01:00 committed by GitHub
parent c2d80d6d70
commit 8b567c20b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/cli/src/WorkflowExecuteAdditionalData.ts
View file

@ -43,9 +43,11 @@ import * as config from '../config';
import { LessThanOrEqual } from "typeorm"; import { LessThanOrEqual } from "typeorm";
const ERROR_TRIGGER_TYPE = config.get('nodes.errorTriggerType') as string;
/** /**
* Checks if there was an error and if errorWorkflow is defined. If so it collects * Checks if there was an error and if errorWorkflow or a trigger is defined. If so it collects
* all the data and executes it * all the data and executes it
* *
* @param {IWorkflowBase} workflowData The workflow which got executed * @param {IWorkflowBase} workflowData The workflow which got executed
@ -54,14 +56,14 @@ import { LessThanOrEqual } from "typeorm";
* @param {string} [executionId] The id the execution got saved as * @param {string} [executionId] The id the execution got saved as
*/ */
function executeErrorWorkflow(workflowData: IWorkflowBase, fullRunData: IRun, mode: WorkflowExecuteMode, executionId?: string, retryOf?: string): void { function executeErrorWorkflow(workflowData: IWorkflowBase, fullRunData: IRun, mode: WorkflowExecuteMode, executionId?: string, retryOf?: string): void {
// Check if there was an error and if so if an errorWorkflow is set // Check if there was an error and if so if an errorWorkflow or a trigger is set
let pastExecutionUrl: string | undefined = undefined; let pastExecutionUrl: string | undefined = undefined;
if (executionId !== undefined) { if (executionId !== undefined) {
pastExecutionUrl = `${WebhookHelpers.getWebhookBaseUrl()}execution/${executionId}`; pastExecutionUrl = `${WebhookHelpers.getWebhookBaseUrl()}execution/${executionId}`;
} }
if (fullRunData.data.resultData.error !== undefined && workflowData.settings !== undefined && workflowData.settings.errorWorkflow) { if (fullRunData.data.resultData.error !== undefined) {
const workflowErrorData = { const workflowErrorData = {
execution: { execution: {
id: executionId, id: executionId,
@ -77,7 +79,12 @@ function executeErrorWorkflow(workflowData: IWorkflowBase, fullRunData: IRun, mo
}, },
}; };
// Run the error workflow // Run the error workflow
WorkflowHelpers.executeErrorWorkflow(workflowData.settings.errorWorkflow as string, workflowErrorData); if(workflowData.id !== undefined && workflowData.nodes.some((node) => node.type === ERROR_TRIGGER_TYPE)) {
WorkflowHelpers.executeErrorWorkflow(workflowData.id.toString(), workflowErrorData);
}
if(workflowData.settings !== undefined && workflowData.settings.errorWorkflow && workflowData.settings.errorWorkflow != workflowData.id) {
WorkflowHelpers.executeErrorWorkflow(workflowData.settings.errorWorkflow as string, workflowErrorData);
}
} }
} }