Websocket: ignore upgrade errors

evcc-io · Sep 1, 2024 · 1b3a5b1 · 1b3a5b1
1 parent 8ac3b3c
commit 1b3a5b1
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/server/socket.go b/server/socket.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"context"
-	"errors"
 	"net/http"
 	"strings"
 	"sync"
@@ -65,17 +64,8 @@ func (h *SocketHub) ServeWebsocket(w http.ResponseWriter, r *http.Request) {
 	}
 	defer conn.Close(websocket.StatusInternalError, "")
 
-	err = h.subscribe(r.Context(), conn)
-
-	if errors.Is(err, context.Canceled) {
-		return
-	}
-	if cs := websocket.CloseStatus(err); cs == websocket.StatusNormalClosure || cs == websocket.StatusGoingAway {
-		return
-	}
-	if err != nil {
-		log.ERROR.Println(err)
-		return
+	if err := h.subscribe(r.Context(), conn); err != nil {
+		log.TRACE.Println("web socket upgrade:", err)
 	}
 }