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

Simplify debug node message processing.

Browse Source 
Make processing more consistent irrespective of complete flag.
Avoid processing when node is inactive.
Avoid duplicate code.
This commit is contained in:
Mark Hindess 2014-07-29 09:32:22 +01:00
parent 78edf89e52
commit deff93f95e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nodes/core/core/58-debug.js
View File

@ -35,7 +35,6 @@ module.exports = function(RED) {
if (this.console == "true") { if (this.console == "true") {
node.log("\n"+util.inspect(msg, {colors:useColors, depth:10})); node.log("\n"+util.inspect(msg, {colors:useColors, depth:10}));
} }
if (msg.payload instanceof Buffer) { msg.payload = "(Buffer) "+msg.payload.toString('hex'); }
if (this.active) { if (this.active) {
sendDebug({id:this.id,name:this.name,topic:msg.topic,msg:msg,_path:msg._path}); sendDebug({id:this.id,name:this.name,topic:msg.topic,msg:msg,_path:msg._path});
} }
@ -48,8 +47,6 @@ module.exports = function(RED) {
else if (typeof msg.payload === "object") { node.log("\n"+util.inspect(msg.payload, {colors:useColors, depth:10})); } else if (typeof msg.payload === "object") { node.log("\n"+util.inspect(msg.payload, {colors:useColors, depth:10})); }
else { node.log(util.inspect(msg.payload, {colors:useColors})); } else { node.log(util.inspect(msg.payload, {colors:useColors})); }
} }
if (typeof msg.payload == "undefined") { msg.payload = "(undefined)"; }
if (msg.payload instanceof Buffer) { msg.payload = "(Buffer) "+msg.payload.toString('hex'); }
if (this.active) { if (this.active) {
sendDebug({id:this.id,name:this.name,topic:msg.topic,msg:msg.payload,_path:msg._path}); sendDebug({id:this.id,name:this.name,topic:msg.topic,msg:msg.payload,_path:msg._path});
} }
@ -62,6 +59,8 @@ module.exports = function(RED) {
function sendDebug(msg) { function sendDebug(msg) {
if (msg.msg instanceof Error) { if (msg.msg instanceof Error) {
msg.msg = msg.msg.toString(); msg.msg = msg.msg.toString();
} else if (msg.msg instanceof Buffer) {
msg.msg = "(Buffer) "+msg.msg.toString('hex');
} else if (typeof msg.msg === 'object') { } else if (typeof msg.msg === 'object') {
var seen = []; var seen = [];
var ty = "(Object) "; var ty = "(Object) ";
@ -79,7 +78,7 @@ module.exports = function(RED) {
} else if (msg.msg === 0) { } else if (msg.msg === 0) {
msg.msg = "0"; msg.msg = "0";
} else if (msg.msg == null) { } else if (msg.msg == null) {
msg.msg = "[undefined]"; msg.msg = "(undefined)";
} }
if (msg.msg.length > debuglength) { if (msg.msg.length > debuglength) {