mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Tidy up when usage in Flow and Node
This commit is contained in:
parent
901b32297e
commit
490903ca25
@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
var util = require("util");
|
var util = require("util");
|
||||||
var EventEmitter = require("events").EventEmitter;
|
var EventEmitter = require("events").EventEmitter;
|
||||||
var when = require("when");
|
|
||||||
|
|
||||||
var redUtil = require("@node-red/util").util;
|
var redUtil = require("@node-red/util").util;
|
||||||
var Log = require("@node-red/util").log; // TODO: separate module
|
var Log = require("@node-red/util").log; // TODO: separate module
|
||||||
@ -92,21 +91,34 @@ Node.prototype.close = function(removed) {
|
|||||||
var callback = this._closeCallbacks[i];
|
var callback = this._closeCallbacks[i];
|
||||||
if (callback.length > 0) {
|
if (callback.length > 0) {
|
||||||
promises.push(
|
promises.push(
|
||||||
when.promise(function(resolve) {
|
new Promise((resolve) => {
|
||||||
|
try {
|
||||||
var args = [];
|
var args = [];
|
||||||
if (callback.length === 2) {
|
if (callback.length === 2) {
|
||||||
args.push(!!removed);
|
args.push(!!removed);
|
||||||
}
|
}
|
||||||
args.push(resolve);
|
args.push(() => {
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
callback.apply(node, args);
|
callback.apply(node, args);
|
||||||
|
} catch(err) {
|
||||||
|
// TODO: error thrown in node async close callback
|
||||||
|
// We've never logged this properly.
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
try {
|
||||||
callback.call(node);
|
callback.call(node);
|
||||||
|
} catch(err) {
|
||||||
|
// TODO: error thrown in node sync close callback
|
||||||
|
// We've never logged this properly.
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (promises.length > 0) {
|
if (promises.length > 0) {
|
||||||
return when.settle(promises).then(function() {
|
return Promise.all(promises).then(function() {
|
||||||
if (this._context) {
|
if (this._context) {
|
||||||
return context.delete(this._alias||this.id,this.z);
|
return context.delete(this._alias||this.id,this.z);
|
||||||
}
|
}
|
||||||
@ -115,7 +127,7 @@ Node.prototype.close = function(removed) {
|
|||||||
if (this._context) {
|
if (this._context) {
|
||||||
return context.delete(this._alias||this.id,this.z);
|
return context.delete(this._alias||this.id,this.z);
|
||||||
}
|
}
|
||||||
return;
|
return Promise.resolve();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -138,8 +150,6 @@ Node.prototype.send = function(msg) {
|
|||||||
/* istanbul ignore else */
|
/* istanbul ignore else */
|
||||||
if (node) {
|
if (node) {
|
||||||
node.receive(msg);
|
node.receive(msg);
|
||||||
} else {
|
|
||||||
console.log("trying to send to a node not on this flow",this._wire);
|
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
@ -187,8 +197,6 @@ Node.prototype.send = function(msg) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
console.log("trying to send to a node not on this flow",this._wire);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -295,4 +303,5 @@ Node.prototype.metric = function(eventname, msg, metricValue) {
|
|||||||
Node.prototype.status = function(status) {
|
Node.prototype.status = function(status) {
|
||||||
this._flow.handleStatus(this,status);
|
this._flow.handleStatus(this,status);
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = Node;
|
module.exports = Node;
|
||||||
|
@ -14,14 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
**/
|
**/
|
||||||
|
|
||||||
var when = require("when");
|
|
||||||
var clone = require("clone");
|
var clone = require("clone");
|
||||||
var Subflow;
|
|
||||||
var Log;
|
|
||||||
var redUtil = require("@node-red/util").util;
|
var redUtil = require("@node-red/util").util;
|
||||||
var flowUtil = require("./util");
|
var flowUtil = require("./util");
|
||||||
var events = require("../../events");
|
var events = require("../../events");
|
||||||
|
|
||||||
|
var Subflow;
|
||||||
|
var Log;
|
||||||
|
|
||||||
var nodeCloseTimeout = 15000;
|
var nodeCloseTimeout = 15000;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -227,19 +227,9 @@ class Flow {
|
|||||||
* @return {[type]} [description]
|
* @return {[type]} [description]
|
||||||
*/
|
*/
|
||||||
stop(stopList, removedList) {
|
stop(stopList, removedList) {
|
||||||
return new Promise((resolve,reject) => {
|
|
||||||
this.trace("stop "+this.TYPE);
|
this.trace("stop "+this.TYPE);
|
||||||
var i;
|
var i;
|
||||||
if (stopList) {
|
if (!stopList) {
|
||||||
// for (i=0;i<stopList.length;i++) {
|
|
||||||
// if (this.subflowInstanceNodes[stopList[i]]) {
|
|
||||||
// console.log("NEED TO STOP A SUBFLOW",stopList[i]);
|
|
||||||
// // The first in the list is the instance node we already
|
|
||||||
// // know about
|
|
||||||
// // stopList = stopList.concat(this.subflowInstanceNodes[stopList[i]].slice(1))
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
} else {
|
|
||||||
stopList = Object.keys(this.activeNodes);
|
stopList = Object.keys(this.activeNodes);
|
||||||
}
|
}
|
||||||
// Convert the list to a map to avoid multiple scans of the list
|
// Convert the list to a map to avoid multiple scans of the list
|
||||||
@ -265,17 +255,14 @@ class Flow {
|
|||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
var removed = removedMap[stopList[i]];
|
var removed = removedMap[stopList[i]];
|
||||||
promises.push(stopNode(node,removed));
|
promises.push(stopNode(node,removed).catch(()=>{}));
|
||||||
} catch(err) {
|
} catch(err) {
|
||||||
node.error(err);
|
node.error(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
when.settle(promises).then(function(results) {
|
return Promise.all(promises);
|
||||||
resolve();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -455,22 +442,20 @@ class Flow {
|
|||||||
* @return {[type]} [description]
|
* @return {[type]} [description]
|
||||||
*/
|
*/
|
||||||
function stopNode(node,removed) {
|
function stopNode(node,removed) {
|
||||||
return when.promise(function(resolve, reject) {
|
|
||||||
var start;
|
|
||||||
when.promise(function(resolve) {
|
|
||||||
Log.trace("Stopping node "+node.type+":"+node.id+(removed?" removed":""));
|
Log.trace("Stopping node "+node.type+":"+node.id+(removed?" removed":""));
|
||||||
start = Date.now();
|
const start = Date.now();
|
||||||
resolve(node.close(removed));
|
const closePromise = node.close(removed);
|
||||||
}).timeout(nodeCloseTimeout).then(function(){
|
const closeTimeout = new Promise((resolve,reject) => {
|
||||||
|
setTimeout(() => {
|
||||||
|
reject("Close timed out");
|
||||||
|
}, nodeCloseTimeout);
|
||||||
|
});
|
||||||
|
return Promise.race([closePromise,closeTimeout]).then(() => {
|
||||||
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)" );
|
||||||
resolve(delta);
|
}).catch(err => {
|
||||||
},function(err) {
|
|
||||||
var delta = Date.now() - start;
|
|
||||||
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);
|
||||||
reject(err);
|
|
||||||
});
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -357,7 +357,7 @@ function start(type,diff,muteLog) {
|
|||||||
|
|
||||||
function stop(type,diff,muteLog) {
|
function stop(type,diff,muteLog) {
|
||||||
if (!started) {
|
if (!started) {
|
||||||
return when.resolve();
|
return Promise.resolve();
|
||||||
}
|
}
|
||||||
type = type||"full";
|
type = type||"full";
|
||||||
diff = diff||{
|
diff = diff||{
|
||||||
@ -395,8 +395,7 @@ function stop(type,diff,muteLog) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return when.promise(function(resolve,reject) {
|
return Promise.resolve(promises).then(function() {
|
||||||
when.settle(promises).then(function() {
|
|
||||||
for (id in activeNodesToFlow) {
|
for (id in activeNodesToFlow) {
|
||||||
if (activeNodesToFlow.hasOwnProperty(id)) {
|
if (activeNodesToFlow.hasOwnProperty(id)) {
|
||||||
if (!activeFlows[activeNodesToFlow[id]]) {
|
if (!activeFlows[activeNodesToFlow[id]]) {
|
||||||
@ -416,8 +415,7 @@ function stop(type,diff,muteLog) {
|
|||||||
log.info(log._("nodes.flows.stopped-flows"));
|
log.info(log._("nodes.flows.stopped-flows"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
resolve();
|
events.emit("nodes-stopped");
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,8 +55,7 @@ describe('Node', function() {
|
|||||||
n.on('close',function() {
|
n.on('close',function() {
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
var p = n.close();
|
n.close();
|
||||||
should.not.exist(p);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('returns a promise when provided a callback with a done parameter',function(testdone) {
|
it('returns a promise when provided a callback with a done parameter',function(testdone) {
|
||||||
|
@ -346,7 +346,7 @@ describe('Flow', function() {
|
|||||||
stoppedNodes.should.have.a.property("2");
|
stoppedNodes.should.have.a.property("2");
|
||||||
stoppedNodes.should.have.a.property("3");
|
stoppedNodes.should.have.a.property("3");
|
||||||
done();
|
done();
|
||||||
});
|
}).catch(done);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("stops specified nodes",function(done) {
|
it("stops specified nodes",function(done) {
|
||||||
|
Loading…
Reference in New Issue
Block a user