admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-16 17:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): Handle missing resultData in runData (#7523)

Browse Source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-10-26 13:15:19 +02:00
committed by GitHub
parent d8ec6eac40
commit 1055bd3762
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/cli/src/WorkflowRunner.ts
View File

@@ -73,8 +73,8 @@ export class WorkflowRunner {
/** /**
* The process did send a hook message so execute the appropriate hook * The process did send a hook message so execute the appropriate hook
*/ */
processHookMessage(workflowHooks: WorkflowHooks, hookData: IProcessMessageDataHook) { async processHookMessage(workflowHooks: WorkflowHooks, hookData: IProcessMessageDataHook) {
void workflowHooks.executeHookFunctions(hookData.hook, hookData.parameters); await workflowHooks.executeHookFunctions(hookData.hook, hookData.parameters);
} }
/** /**
@@ -777,7 +777,7 @@ export class WorkflowRunner {
workflowHooks, workflowHooks,
); );
} else if (message.type === 'processHook') { } else if (message.type === 'processHook') {
this.processHookMessage(workflowHooks, message.data as IProcessMessageDataHook); await this.processHookMessage(workflowHooks, message.data as IProcessMessageDataHook);
} else if (message.type === 'timeout') { } else if (message.type === 'timeout') {
// Execution timed out and its process has been terminated // Execution timed out and its process has been terminated
const timeoutError = new WorkflowOperationError('Workflow execution timed out!'); const timeoutError = new WorkflowOperationError('Workflow execution timed out!');

2
packages/cli/src/executionLifecycleHooks/shared/sharedHookFunctions.ts
View File

@@ -11,7 +11,7 @@ export function determineFinalExecutionStatus(runData: IRun): ExecutionStatus {
const workflowHasCrashed = runData.status === 'crashed'; const workflowHasCrashed = runData.status === 'crashed';
const workflowWasCanceled = runData.status === 'canceled'; const workflowWasCanceled = runData.status === 'canceled';
const workflowDidSucceed = const workflowDidSucceed =
!runData.data.resultData.error && !workflowHasCrashed && !workflowWasCanceled; !runData.data.resultData?.error && !workflowHasCrashed && !workflowWasCanceled;
let workflowStatusFinal: ExecutionStatus = workflowDidSucceed ? 'success' : 'failed'; let workflowStatusFinal: ExecutionStatus = workflowDidSucceed ? 'success' : 'failed';
if (workflowHasCrashed) workflowStatusFinal = 'crashed'; if (workflowHasCrashed) workflowStatusFinal = 'crashed';
if (workflowWasCanceled) workflowStatusFinal = 'canceled'; if (workflowWasCanceled) workflowStatusFinal = 'canceled';