From 25345302e85880602093b02cb2d530dd86ca39ca Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 18 Apr 2018 10:28:51 +0100
Subject: [PATCH] Only add _alias/z to log messages if they are defined

---
 red/runtime/nodes/Node.js           |  8 ++++++--
 test/red/runtime/nodes/Node_spec.js | 10 +++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/red/runtime/nodes/Node.js b/red/runtime/nodes/Node.js
index 462b7f3c8..b8cfa6532 100644
--- a/red/runtime/nodes/Node.js
+++ b/red/runtime/nodes/Node.js
@@ -222,11 +222,15 @@ function log_helper(self, level, msg) {
     var o = {
         level: level,
         id: self.id,
-        z: self.z,
         type: self.type,
-        _alias: self._alias,
         msg: msg
     };
+    if (self._alias) {
+        o._alias = self._alias;
+    }
+    if (self.z) {
+        o.z = self.z;
+    }
     if (self.name) {
         o.name = self.name;
     }
diff --git a/test/red/runtime/nodes/Node_spec.js b/test/red/runtime/nodes/Node_spec.js
index 7190bfba5..95b551f99 100644
--- a/test/red/runtime/nodes/Node_spec.js
+++ b/test/red/runtime/nodes/Node_spec.js
@@ -398,7 +398,7 @@ describe('Node', function() {
             });
             n.log("a log message");
             should.deepEqual({level:Log.INFO, id:n.id,
-                               type:n.type, msg:"a log message",_alias:undefined, z:'789'}, loginfo);
+                               type:n.type, msg:"a log message",z:'789'}, loginfo);
             Log.log.restore();
             done();
         });
@@ -410,7 +410,7 @@ describe('Node', function() {
             });
             n.log("a log message");
             should.deepEqual({level:Log.INFO, id:n.id, name: "barney",
-                              type:n.type, msg:"a log message",_alias:undefined, z:'789'}, loginfo);
+                              type:n.type, msg:"a log message",z:'789'}, loginfo);
             Log.log.restore();
             done();
         });
@@ -425,7 +425,7 @@ describe('Node', function() {
             });
             n.warn("a warning");
             should.deepEqual({level:Log.WARN, id:n.id,
-                              type:n.type, msg:"a warning",_alias:undefined, z:'789'}, loginfo);
+                              type:n.type, msg:"a warning",z:'789'}, loginfo);
             Log.log.restore();
             done();
         });
@@ -444,7 +444,7 @@ describe('Node', function() {
             var message = {a:1};
 
             n.error(null,message);
-            should.deepEqual({level:Log.ERROR, id:n.id, type:n.type, msg:"",_alias:undefined, z:'789'}, loginfo);
+            should.deepEqual({level:Log.ERROR, id:n.id, type:n.type, msg:"",z:'789'}, loginfo);
 
             flows.handleError.called.should.be.true();
             flows.handleError.args[0][0].should.eql(n);
@@ -468,7 +468,7 @@ describe('Node', function() {
             var message = {a:2};
 
             n.error("This is an error",message);
-            should.deepEqual({level:Log.ERROR, id:n.id, type:n.type, msg:"This is an error",_alias:undefined, z:'789'}, loginfo);
+            should.deepEqual({level:Log.ERROR, id:n.id, type:n.type, msg:"This is an error",z:'789'}, loginfo);
 
             flows.handleError.called.should.be.true();
             flows.handleError.args[0][0].should.eql(n);