From d97e23947d956e88d93d9109ef65542a14da2205 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 19 Feb 2014 22:17:20 +0000
Subject: [PATCH] Add uid to mqtt client log messages

This is a semi-temporary change to help debug the multiple-connection issue seen with the MQTT client
---
 nodes/core/io/lib/mqttConnectionPool.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nodes/core/io/lib/mqttConnectionPool.js b/nodes/core/io/lib/mqttConnectionPool.js
index 425d3b2b4..9d9bf88f8 100644
--- a/nodes/core/io/lib/mqttConnectionPool.js
+++ b/nodes/core/io/lib/mqttConnectionPool.js
@@ -29,6 +29,7 @@ module.exports = {
         var id = "["+(username||"")+":"+(password||"")+"]["+(clientid||"")+"]@"+broker+":"+port;
         if (!connections[id]) {
             connections[id] = function() {
+                var uid = (1+Math.random()*4294967295).toString(16);
                 var client = mqtt.createClient(port,broker);
                 client.setMaxListeners(0);
                 var options = {keepalive:15};
@@ -85,7 +86,7 @@ module.exports = {
                 };
                 client.on('connect',function() {
                         if (client) {
-                            util.log('[mqtt] connected to broker tcp://'+broker+':'+port);
+                            util.log('[mqtt] ['+uid+'] connected to broker tcp://'+broker+':'+port);
     
                             connecting = false;
                             for (var s in subscriptions) {
@@ -103,7 +104,7 @@ module.exports = {
                         }
                 });
                 client.on('connectionlost', function(err) {
-                        util.log('[mqtt] connection lost to broker tcp://'+broker+':'+port);
+                        util.log('[mqtt] ['+uid+'] connection lost to broker tcp://'+broker+':'+port);
                         setTimeout(function() {
                                 if (client) {
                                     client.connect(options);
@@ -111,7 +112,7 @@ module.exports = {
                         }, settings.mqttReconnectTime||5000);
                 });
                 client.on('disconnect', function() {
-                        util.log('[mqtt] disconnected from broker tcp://'+broker+':'+port);
+                        util.log('[mqtt] ['+uid+'] disconnected from broker tcp://'+broker+':'+port);
                 });
 
                 return obj