mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-25 04:34:06 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Fix bug that poll did get executed twice

Browse source
This commit is contained in:
Jan Oberhauser 2020-11-24 19:53:48 +01:00
parent 1478a9aecb
commit 0f610e6f5c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/workflow/src/Workflow.ts
View file

@ -974,8 +974,14 @@ export class Workflow {
const thisArgs = nodeExecuteFunctions.getExecuteFunctions(this, runExecutionData, runIndex, connectionInputData, inputData, node, additionalData, mode); const thisArgs = nodeExecuteFunctions.getExecuteFunctions(this, runExecutionData, runIndex, connectionInputData, inputData, node, additionalData, mode);
return nodeType.execute.call(thisArgs); return nodeType.execute.call(thisArgs);
} else if (nodeType.poll) { } else if (nodeType.poll) {
const thisArgs = nodeExecuteFunctions.getExecutePollFunctions(this, node, additionalData, mode); if (mode === 'manual') {
return nodeType.poll.call(thisArgs); // In manual mode run the poll function
const thisArgs = nodeExecuteFunctions.getExecutePollFunctions(this, node, additionalData, mode);
return nodeType.poll.call(thisArgs);
} else {
// In any other mode pass data through as it already contains the result of the poll
return inputData.main as INodeExecutionData[][];
}
} else if (nodeType.trigger) { } else if (nodeType.trigger) {
if (mode === 'manual') { if (mode === 'manual') {
// In manual mode start the trigger // In manual mode start the trigger
@ -1004,12 +1010,12 @@ export class Workflow {
return response; return response;
} else { } else {
// For trigger nodes in any mode except "manual" do we simply pass the data through // For trigger nodes in any mode except "manual" do we simply pass the data through
return NodeHelpers.prepareOutputData(connectionInputData); return inputData.main as INodeExecutionData[][];
} }
} else if (nodeType.webhook) { } else if (nodeType.webhook) {
// For webhook nodes always simply pass the data through // For webhook nodes always simply pass the data through
return NodeHelpers.prepareOutputData(connectionInputData); return inputData.main as INodeExecutionData[][];
} }
return null; return null;