frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Invoke catch node only when msg is provided

This commit is contained in:
Nick O'Leary 2015-02-20 22:59:48 +00:00
parent c5c404ea05
commit 00d0f8cfc7
3 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
red/nodes/Flow.js
View File

@ -734,7 +734,7 @@ Flow.prototype.diffFlow = function(config) {
Flow.prototype.handleError = function(node,logMessage,msg) {
var errorMessage;
if (typeof msg !== "undefined") {
if (msg) {
errorMessage = redUtil.cloneMessage(msg);
} else {
errorMessage = {};

4
red/nodes/Node.js
View File

@ -201,7 +201,9 @@ Node.prototype.warn = function(msg) {
Node.prototype.error = function(logMessage,msg) {
logMessage = logMessage || "";
log_helper(this, Log.ERROR, logMessage);
flows.handleError(this,logMessage,msg);
if (msg) {
flows.handleError(this,logMessage,msg);
}
};
/**

20
test/red/nodes/Flow_spec.js
View File

@ -869,26 +869,6 @@ describe('Flow', function() {
done();
});
it("reports error with undefined message object",function(done) {
var config = [
{id:"1",type:"test",z:"tab1",name:"a",wires:["2"]},
{id:"2",type:"catch",z:"tab1",wires:[[]]},
{id:"3",type:"catch",z:"tab2",wires:[[]]}
];
var flow = new Flow(config);
flow.start();
flow.handleError(getNode(1),"test error");
var n2 = getNode(2);
n2.handled.should.have.lengthOf(1);
n2.handled[0].should.have.property("error");
n2.handled[0].error.should.have.property("message","test error");
n2.handled[0].error.should.have.property("source");
n2.handled[0].error.source.should.have.property("id","1");
n2.handled[0].error.source.should.have.property("type","test");
getNode(3).handled.should.have.lengthOf(0);
done();
});
it("reports error with Error object",function(done) {
var config = [
{id:"1",type:"test",z:"tab1",name:"a",wires:["2"]},