From 72625925760765a81a3460c847309245f8dc639c Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Mon, 27 Nov 2023 12:08:33 +0100
Subject: [PATCH] more config

---
 src/udi/mqtt/mqtt.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/udi/mqtt/mqtt.go b/src/udi/mqtt/mqtt.go
index 77ffc3e..cf0cc4e 100644
--- a/src/udi/mqtt/mqtt.go
+++ b/src/udi/mqtt/mqtt.go
@@ -2,9 +2,6 @@ package mqtt
 
 import "log"
 import "fmt"
-import "os"
-import "strings"
-// import "time"
 import MQTT "github.com/eclipse/paho.mqtt.golang"
 import "github.com/google/uuid"
 import "crypto/tls"
@@ -45,11 +42,13 @@ func onReconnecting(client MQTT.Client, clientOpts *MQTT.ClientOptions) {
 
 
 func onConnect(client MQTT.Client) {
-  topicsStr := os.Getenv("MQTT_SUBSCRIBE_TOPICS")
-  if topicsStr == "" {
-    log.Fatal("No topics given, set env var MQTT_SUBSCRIBE_TOPICS")
+  var topics []string
+  for _, mapping := range config.Config.TopicMappings {
+    topics = append(topics, mapping.Topics...)
+  }
+  if len(topics) == 0 {
+    log.Fatal("No topics given, set in configuration")
   }
-  topics := strings.Split(topicsStr, ",")
   for _, topic := range topics {
     if token := client.Subscribe(topic, 0, onMessageReceived); token.Wait() && token.Error() != nil {
       log.Fatalf("Unable to subscribe to topic %s, error %s", topic, token.Error())