check err

rabbitmq · Dec 2, 2024 · 703e262 · 703e262
1 parent c6b6c5b
commit 703e262
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pkg/mqtt_client/consumer_v5.go b/pkg/mqtt_client/consumer_v5.go
@@ -91,7 +91,11 @@ func (c Mqtt5Consumer) Start(ctx context.Context, subscribed chan bool) {
 	if err != nil {
 		log.Error("consumer connection failed", "id", c.Id, "error", err)
 	}
-	c.Connection.AwaitConnection(ctx)
+	err = c.Connection.AwaitConnection(ctx)
+	if err != nil {
+		// AwaitConnection only returns an error if the context is cancelled
+		return
+	}
 	close(subscribed)
 
 	// TODO: currently we can consume more than ConsumerCount messages

diff --git a/pkg/mqtt_client/publisher_v5.go b/pkg/mqtt_client/publisher_v5.go
@@ -68,7 +68,11 @@ func (p *Mqtt5Publisher) Connect(ctx context.Context) {
 	if err != nil {
 		log.Error("publisher connection failed", "id", p.Id, "error", err)
 	}
-	connection.AwaitConnection(ctx)
+	err = connection.AwaitConnection(ctx)
+	if err != nil {
+		// AwaitConnection only returns an error if the context is cancelled
+		return
+	}
 	p.Connection = connection
 }