From dead7e1a1fedeff292efaad065994bf03272d8f6 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Mon, 29 Nov 2021 11:45:49 -0500 Subject: [PATCH] Live: fix closing ws conns for push endpoints (#42447) (#42464) (cherry picked from commit 7034173ef5f55c9d85ead9e45b00d0c489c648d3) Co-authored-by: Alexander Emelin --- pkg/services/live/pushws/push_pipeline.go | 2 ++ pkg/services/live/pushws/push_stream.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkg/services/live/pushws/push_pipeline.go b/pkg/services/live/pushws/push_pipeline.go index 5651a5d4227..4d6b6f38160 100644 --- a/pkg/services/live/pushws/push_pipeline.go +++ b/pkg/services/live/pushws/push_pipeline.go @@ -55,11 +55,13 @@ func (s *PipelinePushHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) if err != nil { return } + defer func() { _ = conn.Close() }() setupWSConn(r.Context(), conn, s.config) for { _, body, err := conn.ReadMessage() if err != nil { + logger.Debug("Error reading websocket connection", "error", err) break } diff --git a/pkg/services/live/pushws/push_stream.go b/pkg/services/live/pushws/push_stream.go index a7892df2b97..0b1ffbdabbb 100644 --- a/pkg/services/live/pushws/push_stream.go +++ b/pkg/services/live/pushws/push_stream.go @@ -57,11 +57,13 @@ func (s *Handler) ServeHTTP(rw http.ResponseWriter, r *http.Request) { if err != nil { return } + defer func() { _ = conn.Close() }() setupWSConn(r.Context(), conn, s.config) for { _, body, err := conn.ReadMessage() if err != nil { + logger.Debug("Error reading websocket connection", "error", err) break }