mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

👕 Fix lint issue

Browse source
This commit is contained in:
Jan Oberhauser 2020-07-29 14:19:35 +02:00
parent 051598d30e
commit b488ae8d3a
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/src/ActiveExecutions.ts
View file

@ -108,7 +108,7 @@ export class ActiveExecutions {
this.activeExecutions[executionId].process!.send({ this.activeExecutions[executionId].process!.send({
type: timeout ? timeout : 'stopExecution', type: timeout ? timeout : 'stopExecution',
}); });
}, 1) }, 1);
} }
} else { } else {
// Workflow is running in current process // Workflow is running in current process

4
packages/cli/src/Server.ts
View file

@ -486,9 +486,9 @@ class App {
// Do not save when default got set // Do not save when default got set
delete newWorkflowData.settings.saveManualExecutions; delete newWorkflowData.settings.saveManualExecutions;
} }
if (parseInt(newWorkflowData.settings.executionTimeout as string) === this.executionTimeout) { if (parseInt(newWorkflowData.settings.executionTimeout as string, 10) === this.executionTimeout) {
// Do not save when default got set // Do not save when default got set
delete newWorkflowData.settings.executionTimeout delete newWorkflowData.settings.executionTimeout;
} }
} }

16
packages/cli/src/WorkflowRunner.ts
View file

@ -158,14 +158,14 @@ export class WorkflowRunner {
let executionTimeout: NodeJS.Timeout; let executionTimeout: NodeJS.Timeout;
let workflowTimeout = config.get('executions.timeout') as number > 0 && config.get('executions.timeout') as number; // initialize with default let workflowTimeout = config.get('executions.timeout') as number > 0 && config.get('executions.timeout') as number; // initialize with default
if (data.workflowData.settings && data.workflowData.settings.executionTimeout) { if (data.workflowData.settings && data.workflowData.settings.executionTimeout) {
workflowTimeout = data.workflowData.settings!.executionTimeout as number > 0 && data.workflowData.settings!.executionTimeout as number // preference on workflow setting workflowTimeout = data.workflowData.settings!.executionTimeout as number > 0 && data.workflowData.settings!.executionTimeout as number; // preference on workflow setting
} }
if (workflowTimeout) { if (workflowTimeout) {
const timeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds const timeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds
executionTimeout = setTimeout(() => { executionTimeout = setTimeout(() => {
this.activeExecutions.stopExecution(executionId, 'timeout') this.activeExecutions.stopExecution(executionId, 'timeout');
}, timeout) }, timeout);
} }
workflowExecution.then((fullRunData) => { workflowExecution.then((fullRunData) => {
@ -174,7 +174,7 @@ export class WorkflowRunner {
fullRunData.finished = false; fullRunData.finished = false;
} }
this.activeExecutions.remove(executionId, fullRunData); this.activeExecutions.remove(executionId, fullRunData);
}) });
return executionId; return executionId;
} }
@ -239,16 +239,16 @@ export class WorkflowRunner {
let executionTimeout: NodeJS.Timeout; let executionTimeout: NodeJS.Timeout;
let workflowTimeout = config.get('executions.timeout') as number > 0 && config.get('executions.timeout') as number; // initialize with default let workflowTimeout = config.get('executions.timeout') as number > 0 && config.get('executions.timeout') as number; // initialize with default
if (data.workflowData.settings && data.workflowData.settings.executionTimeout) { if (data.workflowData.settings && data.workflowData.settings.executionTimeout) {
workflowTimeout = data.workflowData.settings!.executionTimeout as number > 0 && data.workflowData.settings!.executionTimeout as number // preference on workflow setting workflowTimeout = data.workflowData.settings!.executionTimeout as number > 0 && data.workflowData.settings!.executionTimeout as number; // preference on workflow setting
} }
if (workflowTimeout) { if (workflowTimeout) {
const timeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds const timeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds
executionTimeout = setTimeout(() => { executionTimeout = setTimeout(() => {
this.activeExecutions.stopExecution(executionId, 'timeout') this.activeExecutions.stopExecution(executionId, 'timeout');
executionTimeout = setTimeout(() => subprocess.kill(), Math.max(timeout * 0.2, 5000)) // minimum 5 seconds executionTimeout = setTimeout(() => subprocess.kill(), Math.max(timeout * 0.2, 5000)); // minimum 5 seconds
}, timeout) }, timeout);
} }

2
packages/cli/src/WorkflowRunnerProcess.ts
View file

@ -198,7 +198,7 @@ process.on('message', async (message: IProcessMessage) => {
// Workflow started already executing // Workflow started already executing
runData = workflowRunner.workflowExecute.getFullRunData(workflowRunner.startedAt); runData = workflowRunner.workflowExecute.getFullRunData(workflowRunner.startedAt);
const timeOutError = message.type === 'timeout' ? { message: 'Workflow execution timed out!' } as IExecutionError : undefined const timeOutError = message.type === 'timeout' ? { message: 'Workflow execution timed out!' } as IExecutionError : undefined;
// If there is any data send it to parent process, if execution timedout add the error // If there is any data send it to parent process, if execution timedout add the error
await workflowRunner.workflowExecute.processSuccessExecution(workflowRunner.startedAt, workflowRunner.workflow!, timeOutError); await workflowRunner.workflowExecute.processSuccessExecution(workflowRunner.startedAt, workflowRunner.workflow!, timeOutError);

6
packages/editor-ui/src/components/WorkflowSettings.vue
View file

@ -122,15 +122,15 @@
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-input-number size="small" v-model="timeoutHMS.hours" :min="0" placeholder="hours" type="number" class="el-input_inner"></el-input-number></br> <el-input-number size="small" v-model="timeoutHMS.hours" :min="0" placeholder="hours" type="number" class="el-input_inner"></el-input-number><br />
<div class="timeout-setting-name">hours</div> <div class="timeout-setting-name">hours</div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-input-number size="small" v-model="timeoutHMS.minutes" :min="0" placeholder="minutes" type="number" class="el-input_inner"></el-input-number></br> <el-input-number size="small" v-model="timeoutHMS.minutes" :min="0" placeholder="minutes" type="number" class="el-input_inner"></el-input-number><br />
<div class="timeout-setting-name">minutes</div> <div class="timeout-setting-name">minutes</div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-input-number size="small" v-model="timeoutHMS.seconds" :min="0" placeholder="seconds" type="number" class="el-input_inner"></el-input-number></br> <el-input-number size="small" v-model="timeoutHMS.seconds" :min="0" placeholder="seconds" type="number" class="el-input_inner"></el-input-number><br />
<div class="timeout-setting-name">seconds</div> <div class="timeout-setting-name">seconds</div>
</el-col> </el-col>
</el-row> </el-row>