mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-23 10:32:17 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(core): Fix calling error workflows in main mode recovery (#5698)

Browse source 
* fix calling error workflows in main mode recovery

* cleanup

* remove WorkflowExecuteAdditionalData export from index

* revert refactor to fix test

* Update index.ts

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <netroy@users.noreply.github.com>
This commit is contained in:
Michael Auerswald 2023-03-17 18:02:49 +01:00 committed by GitHub
parent 19dded18c9
commit e0ea97af8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
View file

@ -10,6 +10,7 @@ import { workflowExecutionCompleted } from '../../events/WorkflowStatistics';
import { eventBus } from './MessageEventBus'; import { eventBus } from './MessageEventBus';
import { Container } from 'typedi'; import { Container } from 'typedi';
import { InternalHooks } from '@/InternalHooks'; import { InternalHooks } from '@/InternalHooks';
import { getWorkflowHooksMain } from '@/WorkflowExecuteAdditionalData';
export async function recoverExecutionDataFromEventLogMessages( export async function recoverExecutionDataFromEventLogMessages(
executionId: string, executionId: string,
@ -122,9 +123,6 @@ export async function recoverExecutionDataFromEventLogMessages(
} }
} }
if (!executionData.resultData.error && workflowError) {
executionData.resultData.error = workflowError;
}
if (!lastNodeRunTimestamp) { if (!lastNodeRunTimestamp) {
const workflowEndedMessage = messages.find((message) => const workflowEndedMessage = messages.find((message) =>
( (
@ -138,6 +136,11 @@ export async function recoverExecutionDataFromEventLogMessages(
if (workflowEndedMessage) { if (workflowEndedMessage) {
lastNodeRunTimestamp = workflowEndedMessage.ts; lastNodeRunTimestamp = workflowEndedMessage.ts;
} else { } else {
if (!workflowError) {
workflowError = new WorkflowOperationError(
'Workflow did not finish, possible out-of-memory issue',
);
}
const workflowStartedMessage = messages.find( const workflowStartedMessage = messages.find(
(message) => message.eventName === 'n8n.workflow.started', (message) => message.eventName === 'n8n.workflow.started',
); );
@ -146,6 +149,11 @@ export async function recoverExecutionDataFromEventLogMessages(
} }
} }
} }
if (!executionData.resultData.error && workflowError) {
executionData.resultData.error = workflowError;
}
if (applyToDb) { if (applyToDb) {
await Db.collections.Execution.update(executionId, { await Db.collections.Execution.update(executionId, {
data: stringify(executionData), data: stringify(executionData),
@ -174,6 +182,20 @@ export async function recoverExecutionDataFromEventLogMessages(
stoppedAt: lastNodeRunTimestamp?.toJSDate(), stoppedAt: lastNodeRunTimestamp?.toJSDate(),
status: 'crashed', status: 'crashed',
}; };
const workflowHooks = getWorkflowHooksMain(
{
userId: '',
workflowData: executionEntry.workflowData,
executionMode: executionEntry.mode,
executionData,
runData: executionData.resultData.runData,
retryOf: executionEntry.retryOf,
},
executionId,
);
// execute workflowExecuteAfter hook to trigger error workflow
await workflowHooks.executeHookFunctions('workflowExecuteAfter', [iRunData]);
// calling workflowExecutionCompleted directly because the eventEmitter is not up yet at this point // calling workflowExecutionCompleted directly because the eventEmitter is not up yet at this point
await workflowExecutionCompleted(executionEntry.workflowData, iRunData); await workflowExecutionCompleted(executionEntry.workflowData, iRunData);