From 472018ea85163b41d0b6a845f20707c27e329966 Mon Sep 17 00:00:00 2001
From: jkerdreux-imt <jerome.kerdreux@imt-atlantique.fr>
Date: Tue, 19 Nov 2024 00:30:30 +0100
Subject: [PATCH] Cleanup
---
gateway.go | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gateway.go b/gateway.go
index b834183..7341ac8 100644
--- a/gateway.go
+++ b/gateway.go
@@ -58,21 +58,21 @@ func (gw *Gateway) mqttPublishHander(client MQTT.Client, msg MQTT.Message) {
}
// Is it devices definitions ?
if msg.Topic() == gw.config.topic+"/bridge/devices" {
- gw.jsonParseDevices(msg.Payload())
+ gw.jsonParseDevices(msg)
} else {
- dev := gw.GetZDeviceByTopic(msg.Topic())
+ zDev := gw.GetZDeviceByTopic(msg.Topic())
// mqttDumpMsg(msg)
- if dev != nil {
- dev.HandleMessage(msg)
+ if zDev != nil {
+ zDev.HandleMessage(msg)
}
}
}
// jsonParseDevices parses the bridge/devices json and creates new xAAL devices
// if they don't exist
-func (gw *Gateway) jsonParseDevices(jsonData []byte) {
+func (gw *Gateway) jsonParseDevices(msg MQTT.Message) {
var devices []Z2MDevice
- err := json.Unmarshal([]byte(jsonData), &devices)
+ err := json.Unmarshal(msg.Payload(), &devices)
if err != nil {
slog.Error("Error decoding JSON", "err", err)
}
--
GitLab