From 5b53098d47611e1a39b1614cd8736dc572e2d99c Mon Sep 17 00:00:00 2001
From: jkerdreux-imt <jerome.kerdreux@imt-atlantique.fr>
Date: Tue, 28 Jan 2025 18:39:16 +0100
Subject: [PATCH] Fix Subscribe API / Cleaned jsonDump API
---
mqtt.go | 14 +++++++-------
utils.go | 4 ++--
xaal.go | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/mqtt.go b/mqtt.go
index f377f67..8b44ca4 100644
--- a/mqtt.go
+++ b/mqtt.go
@@ -31,13 +31,13 @@ func MQTTSetup(cfg *Config, publishHandler mqtt.MessageHandler) mqtt.Client {
return client
}
-func MQTTSubscribe(client mqtt.Client, cfg *Config) error {
- token := client.Subscribe(cfg.topic+"/#", 0, nil)
- if err := token.Wait(); token.Error() != nil {
- return fmt.Errorf("failed to subscribe to topic '%s/#': %v", cfg.topic, err)
+func MQTTSubscribe(client mqtt.Client, cfg *Config) {
+ topic := cfg.topic + "/#"
+ token := client.Subscribe(topic, 0, nil)
+ if token.Wait(); token.Error() != nil {
+ slog.Warn("MQTTSubscribe failed", "topic", topic, "err", token.Error())
}
- slog.Debug("Subscribed to", "Topic", cfg.topic+"/#")
- return nil
+ slog.Debug("Subscribed to", "Topic", topic)
}
func MQTTLostCnx(client mqtt.Client, err error) {
@@ -51,5 +51,5 @@ func MQTTDumpMsg(msg mqtt.Message) {
if err != nil {
slog.Error("Error decoding JSON %v", "topic", msg.Topic(), "err", err)
}
- jsonDump(data)
+ jsonDump("MQTT update", data)
}
diff --git a/utils.go b/utils.go
index ada4f97..6d3e6d1 100644
--- a/utils.go
+++ b/utils.go
@@ -24,7 +24,7 @@ func hexStringToInteger(hexString string) (uint64, error) {
return integerValue, nil
}
-func jsonDump(data map[string]interface{}) {
+func jsonDump(title string, data map[string]interface{}) {
// sort keys
keys := make([]string, 0)
for key := range data {
@@ -33,7 +33,7 @@ func jsonDump(data map[string]interface{}) {
sort.Strings(keys)
// dump keys
tab := table.NewWriter()
- tab.SetTitle("MQTT update")
+ tab.SetTitle(title)
tab.SetStyle(table.StyleRounded)
for _, key := range keys {
if key != "update" {
diff --git a/xaal.go b/xaal.go
index df097ec..042b199 100644
--- a/xaal.go
+++ b/xaal.go
@@ -526,5 +526,5 @@ func NewDebugDevice(addr uuid.UUID, zDev *Z2MDevice, exp *Expose) XAALDeviceInte
func (dev *DebugDevice) update(payload map[string]interface{}) {
slog.Info("Debug Device update", "payload", payload)
- jsonDump(payload)
+ jsonDump("Debug Device update", payload)
}
--
GitLab