From 7b2763a0533d6af2cedd7b06c1584139e507be2c Mon Sep 17 00:00:00 2001
From: Koenkk <koenkanters94@gmail.com>
Date: Wed, 30 May 2018 18:09:24 +0200
Subject: [PATCH] Log devices to bridge/log. #77

---
 lib/controller.js | 9 ++-------
 lib/mqtt.js       | 5 +++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/controller.js b/lib/controller.js
index 99422387c..39c827258 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -200,7 +200,7 @@ class Controller {
         if (!settings.getDevice(device.ieeeAddr)) {
             logger.info(`New device with address ${device.ieeeAddr} connected!`);
             settings.addDevice(device.ieeeAddr);
-            this.mqttLog('device_connected', device.ieeeAddr);
+            this.mqtt.log('device_connected', device.ieeeAddr);
         }
 
         // We can't handle devices without modelId.
@@ -291,7 +291,7 @@ class Controller {
                 };
             });
 
-            this.mqtt.publish('bridge/devices', JSON.stringify(devices), {retain: false});
+            this.mqtt.log('devices', devices);
         } else {
             logger.warn(`Cannot handle MQTT config option '${option}' with message '${message}'`);
         }
@@ -368,11 +368,6 @@ class Controller {
 
         this.mqtt.publish(deviceSettings.friendly_name, JSON.stringify(payload), options);
     }
-
-    mqttLog(type, message) {
-        const payload = {type: type, message: message};
-        this.mqtt.publish('bridge/log', JSON.stringify(payload), {retain: false});
-    }
 }
 
 module.exports = Controller;
diff --git a/lib/mqtt.js b/lib/mqtt.js
index 14b382ff3..93a30bbcb 100644
--- a/lib/mqtt.js
+++ b/lib/mqtt.js
@@ -75,6 +75,11 @@ class MQTT {
         logger.info(`MQTT publish, topic: '${topic}', payload: '${payload}'`);
         this.client.publish(topic, payload, options, callback);
     }
+
+    log(type, message) {
+        const payload = {type: type, message: message};
+        this.publish('bridge/log', JSON.stringify(payload), {retain: false});
+    }
 }
 
 module.exports = MQTT;