MPX-59 - Fix MQTT over WS context cancellation (#61)

* Upgraded the context in http handler Signed-off-by: nyagamunene <[email protected]> * Created new context for pass function Signed-off-by: nyagamunene <[email protected]> * Commented on the new changes Signed-off-by: nyagamunene <[email protected]> * Added more commit messages Signed-off-by: nyagamunene <[email protected]> --------- Signed-off-by: nyagamunene <[email protected]>
absmach · Apr 23, 2024 · b69aa82 · b69aa82
1 parent 0e4992b
commit b69aa82
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/pkg/mqtt/websocket/websocket.go b/pkg/mqtt/websocket/websocket.go
@@ -68,12 +68,15 @@ func (p Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	go p.pass(r.Context(), cconn)
+	go p.pass(cconn)
 }
 
-func (p Proxy) pass(ctx context.Context, in *websocket.Conn) {
+func (p Proxy) pass(in *websocket.Conn) {
 	defer in.Close()
-
+	// Using a new context so as to avoiding infinitely long traces.
+	// And also avoiding proxy cancellation due to parent context cancellation.
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	dialer := &websocket.Dialer{
 		Subprotocols: []string{"mqtt"},
 	}