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

refactor(core): Stronger typing for workflow settings (no-changelog) (#5754)

Browse Source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-03-24 13:11:48 +01:00
committed by GitHub
parent d33a1ac1e9
commit c9d9069c0e
11 changed files with 77 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/cli/src/WorkflowRunnerProcess.ts
View File

@@ -130,13 +130,10 @@ class WorkflowRunnerProcess {
const license = Container.get(License);
await license.init(instanceId);
// Start timeout for the execution
let workflowTimeout = config.getEnv('executions.timeout'); // initialize with default
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
if (this.data.workflowData.settings && this.data.workflowData.settings.executionTimeout) {
workflowTimeout = this.data.workflowData.settings.executionTimeout as number; // preference on workflow setting
}
const workflowSettings = this.data.workflowData.settings ?? {};
// Start timeout for the execution
let workflowTimeout = workflowSettings.executionTimeout ?? config.getEnv('executions.timeout'); // initialize with default
if (workflowTimeout > 0) {
workflowTimeout = Math.min(workflowTimeout, config.getEnv('executions.maxTimeout'));
}