frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Clear node.close timeout to avoid unnecessary work on restart

Browse Source
This commit is contained in:
Nick O'Leary 2020-03-31 19:25:20 +01:00
parent e7f942eda7
commit a6ecb54cc4
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js vendored
View File

@ -571,15 +571,18 @@ function stopNode(node,removed) {
Log.trace("Stopping node "+node.type+":"+node.id+(removed?" removed":"")); Log.trace("Stopping node "+node.type+":"+node.id+(removed?" removed":""));
const start = Date.now(); const start = Date.now();
const closePromise = node.close(removed); const closePromise = node.close(removed);
let closeTimer = null;
const closeTimeout = new Promise((resolve,reject) => { const closeTimeout = new Promise((resolve,reject) => {
setTimeout(() => { closePromise = setTimeout(() => {
reject("Close timed out"); reject("Close timed out");
}, nodeCloseTimeout); }, nodeCloseTimeout);
}); });
return Promise.race([closePromise,closeTimeout]).then(() => { return Promise.race([closePromise,closeTimeout]).then(() => {
clearTimeout(closeTimer);
var delta = Date.now() - start; var delta = Date.now() - start;
Log.trace("Stopped node "+node.type+":"+node.id+" ("+delta+"ms)" ); Log.trace("Stopped node "+node.type+":"+node.id+" ("+delta+"ms)" );
}).catch(err => { }).catch(err => {
clearTimeout(closeTimer);
node.error(Log._("nodes.flows.stopping-error",{message:err})); node.error(Log._("nodes.flows.stopping-error",{message:err}));
Log.debug(err.stack); Log.debug(err.stack);
}) })