From cb3610b0125f35fedf5de41c222324891080f645 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Wed, 13 Feb 2019 19:49:06 +0100
Subject: [PATCH] Log more to MQTT. #1075

---
 lib/extension/bind.js         | 5 +++++
 lib/extension/bridgeConfig.js | 2 ++
 lib/extension/groups.js       | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/lib/extension/bind.js b/lib/extension/bind.js
index 6e79378680..388a832bf0 100644
--- a/lib/extension/bind.js
+++ b/lib/extension/bind.js
@@ -109,6 +109,11 @@ class Bind {
                             `Successfully ${topic.type === 'bind' ? 'bound' : 'unbound'} cluster '${cluster}' from ` +
                             `${sourceEntity.ID}' to '${targetEntity.ID}'`
                         );
+
+                        this.mqtt.log(
+                            `device_${topic.type}`,
+                            {from: sourceEntity.ID, to: targetEntity.ID, cluster: cluster}
+                        );
                     }
 
                     queueCallback();
diff --git a/lib/extension/bridgeConfig.js b/lib/extension/bridgeConfig.js
index 9aaec2f555..b650faec74 100644
--- a/lib/extension/bridgeConfig.js
+++ b/lib/extension/bridgeConfig.js
@@ -84,6 +84,7 @@ class BridgeConfig {
 
         if (settings.changeFriendlyName(json.old, json.new)) {
             logger.info(`Successfully renamed - ${json.old} to ${json.new} `);
+            this.mqtt.log('device_renamed', {from: json.old, to: json.new});
         } else {
             logger.error(`Failed to renamed - ${json.old} to ${json.new}`);
             return;
@@ -131,6 +132,7 @@ class BridgeConfig {
 
     onMQTTConnected() {
         this.mqtt.subscribe(`${settings.get().mqtt.base_topic}/bridge/config/+`);
+        this.publish();
     }
 
     onMQTTMessage(topic, message) {
diff --git a/lib/extension/groups.js b/lib/extension/groups.js
index f11c773087..3f1c073bdb 100644
--- a/lib/extension/groups.js
+++ b/lib/extension/groups.js
@@ -80,6 +80,14 @@ class Groups {
                 logger.error(`Failed to ${topic.type} ${ieeeAddr} from ${topic.friendly_name}`);
             } else {
                 logger.info(`Successfully ${topic.type} ${ieeeAddr} to ${topic.friendly_name}`);
+
+                // Log to MQTT
+                const log = {device: message};
+                if (['remove', 'add'].includes(topic.type)) {
+                    log.group = topic.friendly_name;
+                }
+
+                this.mqtt.log(log);
             }
         };