fix: prevent duplicate mqtt connections (#229)

chirpstack · Jun 27, 2023 · 2d793a4 · 2d793a4
1 parent c1f5508
commit 2d793a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cmd/chirpstack-gateway-bridge/cmd/root.go b/cmd/chirpstack-gateway-bridge/cmd/root.go
@@ -63,7 +63,7 @@ func init() {
 	viper.SetDefault("integration.mqtt.state_retained", true)
 	viper.SetDefault("integration.mqtt.keep_alive", 30*time.Second)
 	viper.SetDefault("integration.mqtt.max_reconnect_interval", time.Minute)
-	viper.SetDefault("integration.mqtt.max_token_wait", 5*time.Second)
+	viper.SetDefault("integration.mqtt.max_token_wait", time.Minute)
 
 	viper.SetDefault("integration.mqtt.auth.generic.servers", []string{"tcp://127.0.0.1:1883"})
 	viper.SetDefault("integration.mqtt.auth.generic.clean_session", true)

diff --git a/internal/integration/mqtt/backend.go b/internal/integration/mqtt/backend.go
@@ -383,6 +383,9 @@ func (b *Backend) connect() error {
 		return errors.Wrap(err, "integration/mqtt: update authentication error")
 	}
 
+	if b.conn != nil {
+		b.conn.Disconnect(250)
+	}
 	b.conn = paho.NewClient(b.clientOpts)
 	if err := tokenWrapper(b.conn.Connect(), b.maxTokenWait); err != nil {
 		return err