IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Live: fix closing ws conns for push endpoints (#42447)

Browse Source
This commit is contained in:
Alexander Emelin 2021-11-29 19:22:42 +03:00 committed by GitHub
parent 98dcac7596
commit 7034173ef5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/live/pushws/push_pipeline.go
View File

@ -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
}

2
pkg/services/live/pushws/push_stream.go
View File

@ -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
}