fix concurrent write panic #6

Mrs4s · Jul 30, 2020 · 3aea70e · 3aea70e
1 parent d1505ec
commit 3aea70e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/server/websocket.go b/server/websocket.go
@@ -170,7 +170,9 @@ func (c *websocketClient) listenApi(conn *wsc.Conn, u bool) {
 			if j.Get("echo").Exists() {
 				ret["echo"] = j.Get("echo").Value()
 			}
+			c.pushLock.Lock()
 			_, _ = conn.Write([]byte(ret.ToJson()))
+			c.pushLock.Unlock()
 		}
 	}
 	if c.conf.ReverseReconnectInterval != 0 {
@@ -276,7 +278,9 @@ func (s *websocketServer) listenApi(c *websocket.Conn) {
 				if j.Get("echo").Exists() {
 					ret["echo"] = j.Get("echo").Value()
 				}
+				s.pushLock.Lock()
 				_ = c.WriteJSON(ret)
+				s.pushLock.Unlock()
 			}
 		}
 	}