mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 18:12:04 +00:00
fix(core): Do not execute workflowExecuteBefore hook when resuming executions from a waiting state (#5727)
This commit is contained in:
committed by
GitHub
parent
b1e1c5b306
commit
6689451e8c
@@ -728,6 +728,7 @@ export interface IProcessMessageDataHook {
|
||||
|
||||
export interface IWorkflowExecutionDataProcess {
|
||||
destinationNode?: string;
|
||||
restartExecutionId?: string;
|
||||
executionMode: WorkflowExecuteMode;
|
||||
executionData?: IRunExecutionData;
|
||||
runData?: IRunData;
|
||||
|
||||
@@ -271,6 +271,7 @@ export class WorkflowRunner {
|
||||
undefined,
|
||||
workflowTimeout <= 0 ? undefined : Date.now() + workflowTimeout * 1000,
|
||||
);
|
||||
additionalData.restartExecutionId = restartExecutionId;
|
||||
|
||||
// Register the active execution
|
||||
const executionId = await this.activeExecutions.add(data, undefined, restartExecutionId);
|
||||
@@ -644,6 +645,8 @@ export class WorkflowRunner {
|
||||
data.workflowData.staticData = await WorkflowHelpers.getStaticDataById(workflowId);
|
||||
}
|
||||
|
||||
data.restartExecutionId = restartExecutionId;
|
||||
|
||||
// Register the active execution
|
||||
const executionId = await this.activeExecutions.add(data, subprocess, restartExecutionId);
|
||||
|
||||
|
||||
@@ -170,6 +170,7 @@ class WorkflowRunnerProcess {
|
||||
undefined,
|
||||
workflowTimeout <= 0 ? undefined : Date.now() + workflowTimeout * 1000,
|
||||
);
|
||||
additionalData.restartExecutionId = this.data.restartExecutionId;
|
||||
additionalData.hooks = this.getProcessForwardHooks();
|
||||
|
||||
additionalData.hooks.hookFunctions.sendResponse = [
|
||||
|
||||
@@ -746,7 +746,9 @@ export class WorkflowExecute {
|
||||
|
||||
const returnPromise = (async () => {
|
||||
try {
|
||||
if (!this.additionalData.restartExecutionId) {
|
||||
await this.executeHook('workflowExecuteBefore', [workflow]);
|
||||
}
|
||||
} catch (error) {
|
||||
// Set the error that it can be saved correctly
|
||||
executionError = {
|
||||
|
||||
@@ -1677,6 +1677,7 @@ export interface IWorkflowExecuteAdditionalData {
|
||||
) => Promise<any>;
|
||||
// hooks?: IWorkflowExecuteHooks;
|
||||
executionId?: string;
|
||||
restartExecutionId?: string;
|
||||
hooks?: WorkflowHooks;
|
||||
httpResponse?: express.Response;
|
||||
httpRequest?: express.Request;
|
||||
|
||||
Reference in New Issue
Block a user