Allow custom MQTT Client ID (#1128)

evcc-io · Jun 11, 2021 · cb3c9fe · cb3c9fe
1 parent fe2f5f6
commit cb3c9fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cmd/setup.go b/cmd/setup.go
@@ -111,7 +111,10 @@ func configureDatabase(conf server.InfluxConfig, loadPoints []core.LoadPointAPI,
 // setup mqtt
 func configureMQTT(conf mqttConfig) error {
 	log := util.NewLogger("mqtt")
-	clientID := mqtt.ClientID()
+	clientID := conf.ClientID
+	if clientID == "" {
+		clientID = mqtt.ClientID()
+	}
 
 	var err error
 	mqtt.Instance, err = mqtt.RegisteredClient(log, conf.Broker, conf.User, conf.Password, clientID, 1)

diff --git a/provider/mqtt/client.go b/provider/mqtt/client.go
@@ -30,6 +30,7 @@ type Config struct {
 	Broker   string
 	User     string
 	Password string
+	ClientID string
 }
 
 // Client encapsulates mqtt publish/subscribe functions

diff --git a/provider/mqtt/registry.go b/provider/mqtt/registry.go
@@ -33,7 +33,7 @@ func RegisteredClient(log *util.Logger, broker, user, password, clientID string,
 	client, err := registry.Get(key)
 
 	if err != nil {
-		if client, err = NewClient(log, broker, user, password, ClientID(), qos); err == nil {
+		if client, err = NewClient(log, broker, user, password, clientID, qos); err == nil {
 			registry.Add(key, client)
 		}
 	}