From fa03ae54bc8b9f696e74925a25aa14f1d0fe78d6 Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Mon, 16 Nov 2020 00:14:22 +0100 Subject: [PATCH] Move websocket connection close out of channel close mutex --- server/websocket.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/websocket.go b/server/websocket.go index 577cb337..d7746085 100644 --- a/server/websocket.go +++ b/server/websocket.go @@ -144,6 +144,7 @@ func (s *WebsocketServer) GetHandler() http.Handler { func (s *WebsocketServer) closeChannel(c *websocketChannel) { if c.CloseOut() { + c.conn.Close() s.onDisconnect(c) } } @@ -152,7 +153,6 @@ func (c *websocketChannel) CloseOut() bool { c.aliveLock.Lock() defer c.aliveLock.Unlock() if c.alive { - c.conn.Close() c.alive = false //clean out close(c.out)