frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Timeout a node that fails to close - default 15s timeout

Browse Source
This commit is contained in:
Nick O'Leary
2017-05-15 13:05:33 +01:00
parent a5ade39d7c
commit d4135e80a6
4 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
red/runtime/nodes/flows/Flow.js
View File

@@ -21,6 +21,8 @@ var Log = require("../../log");
var redUtil = require("../../util");
var flowUtil = require("./util");
var nodeCloseTimeout = 15000;
function Flow(global,flow) {
if (typeof flow === 'undefined') {
flow = global;
@@ -151,16 +153,35 @@ function Flow(global,flow) {
delete subflowInstanceNodes[stopList[i]];
}
try {
var p = node.close(removedMap[stopList[i]]);
if (p) {
promises.push(p);
}
var removed = removedMap[stopList[i]];
promises.push(
when.promise(function(resolve, reject) {
var start;
var nt = node.type;
var nid = node.id;
var n = node;
when.promise(function(resolve) {
Log.trace("Stopping node "+nt+":"+nid+(removed?" removed":""));
start = Date.now();
resolve(n.close(removed));
}).timeout(nodeCloseTimeout).then(function(){
var delta = Date.now() - start;
Log.trace("Stopped node "+nt+":"+nid+" ("+delta+"ms)" );
resolve(delta);
},function(err) {
var delta = Date.now() - start;
n.error(Log._("nodes.flows.stopping-error",{message:err}));
Log.debug(err.stack);
reject(err);
});
})
);
} catch(err) {
node.error(err);
}
}
}
when.settle(promises).then(function() {
when.settle(promises).then(function(results) {
resolve();
});
});
@@ -472,7 +493,11 @@ function createSubflow(sf,sfn,subflows,globalSubflows,activeNodes) {
return nodes;
}
module.exports = {
init: function(settings) {
nodeCloseTimeout = settings.nodeCloseTimeout || 15000;
},
create: function(global,conf) {
return new Flow(global,conf);
}

1
red/runtime/nodes/flows/index.js
View File

@@ -66,6 +66,7 @@ function init(runtime) {
});
typeEventRegistered = true;
}
Flow.init(settings);
}
function loadFlows() {