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

Detect and prevent Catch node loops

Browse Source
This commit is contained in:
Nick O'Leary 2015-06-15 15:09:50 +01:00
parent eae4e3d983
commit c5fd3a5753
1 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
red/nodes/Flow.js
View File

@ -744,28 +744,45 @@ function diffFlow(flow,config) {
Flow.prototype.handleError = function(node,logMessage,msg) { Flow.prototype.handleError = function(node,logMessage,msg) {
var errorMessage; var targetCatchNode = null;
if (msg) {
errorMessage = redUtil.cloneMessage(msg);
} else {
errorMessage = {};
}
if (errorMessage.hasOwnProperty("error")) {
errorMessage._error = errorMessage.error;
}
errorMessage.error = {
message: logMessage.toString(),
source: {
id: node.id,
type: node.type
}
};
if (this.catchNodeMap[node.z]) { if (this.catchNodeMap[node.z]) {
this.catchNodeMap[node.z].receive(errorMessage); targetCatchNode = this.catchNodeMap[node.z];
} else { } else if (this.activeNodes[node.z] && this.catchNodeMap[this.activeNodes[node.z].z]) {
if (this.activeNodes[node.z] && this.catchNodeMap[this.activeNodes[node.z].z]) { targetCatchNode = this.catchNodeMap[this.activeNodes[node.z].z];
this.catchNodeMap[this.activeNodes[node.z].z].receive(errorMessage); }
if (targetCatchNode) {
var count = 1;
if (msg.hasOwnProperty("error")) {
if (msg.error.hasOwnProperty("source")) {
if (msg.error.source.id === node.id) {
count = msg.error.source.count+1;
if (count === 10) {
node.warn("Message exceeded maximum number of catches");
return;
}
}
}
} }
var errorMessage;
if (msg) {
errorMessage = redUtil.cloneMessage(msg);
} else {
errorMessage = {};
}
if (errorMessage.hasOwnProperty("error")) {
errorMessage._error = errorMessage.error;
}
errorMessage.error = {
message: logMessage.toString(),
source: {
id: node.id,
type: node.type,
count: count
}
};
targetCatchNode.receive(errorMessage);
} }
} }