admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-19 11:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): Run Error Workflow also on trigger activation error (#3470)

Browse Source 
* feat(core): Run Error Workflow also when workflow gets deactivated
or could not be activated on startup because of error
R#

* ⚡ Add missing file
This commit is contained in:
Jan Oberhauser
2022-06-06 09:17:35 +02:00
committed by GitHub
parent ff95de0bdd
commit b5535e4a62
6 changed files with 97 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
packages/core/src/ActiveWorkflows.ts
View File

@@ -13,6 +13,7 @@ import {
LoggerProxy as Logger,
Workflow,
WorkflowActivateMode,
WorkflowActivationError,
WorkflowExecuteMode,
} from 'n8n-workflow';
@@ -82,17 +83,26 @@ export class ActiveWorkflows {
let triggerResponse: ITriggerResponse | undefined;
this.workflowData[id].triggerResponses = [];
for (const triggerNode of triggerNodes) {
triggerResponse = await workflow.runTrigger(
triggerNode,
getTriggerFunctions,
additionalData,
mode,
activation,
);
if (triggerResponse !== undefined) {
// If a response was given save it
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this.workflowData[id].triggerResponses!.push(triggerResponse);
try {
triggerResponse = await workflow.runTrigger(
triggerNode,
getTriggerFunctions,
additionalData,
mode,
activation,
);
if (triggerResponse !== undefined) {
// If a response was given save it
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this.workflowData[id].triggerResponses!.push(triggerResponse);
}
} catch (error) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
throw new WorkflowActivationError(
'There was a problem activating the workflow',
error,
triggerNode,
);
}
}
@@ -100,17 +110,26 @@ export class ActiveWorkflows {
if (pollNodes.length) {
this.workflowData[id].pollResponses = [];
for (const pollNode of pollNodes) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this.workflowData[id].pollResponses!.push(
await this.activatePolling(
try {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this.workflowData[id].pollResponses!.push(
await this.activatePolling(
pollNode,
workflow,
additionalData,
getPollFunctions,
mode,
activation,
),
);
} catch (error) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
throw new WorkflowActivationError(
'There was a problem activating the workflow',
error,
pollNode,
workflow,
additionalData,
getPollFunctions,
mode,
activation,
),
);
);
}
}
}
}