Improved context cancel check after websocket closure

insighio · Apr 5, 2024 · 1ca874f · 1ca874f
1 parent 1dbc52e
commit 1ca874f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/pkg/mqtt/websocket/websocket.go b/pkg/mqtt/websocket/websocket.go
@@ -68,9 +68,10 @@ func (p Proxy) handle() http.Handler {
 		go func() {
 			defer cancel() // Cancel the context when the goroutine finishes
 			p.pass(ctx, cconn)
-			if err := ctx.Err(); err != nil {
-				p.logger.Info("Context error at the end of goroutine", slog.Any("error", err))
-			} else {
+			select {
+			case <-ctx.Done():
+				p.logger.Info("Context cancelled at the end of goroutine", slog.Any("error", ctx.Err()))
+			default:
 				p.logger.Info("Context still active at the end of goroutine")
 			}
 		}()