tcjlj/flvx
1
0
Fork 0
mirror of https://github.com/Sagit-chu/flvx.git synced 2026-10-05 17:46:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #91 from Sagit-chu/opencode/lucky-otter

Browse Source 
fix(ws): prevent monitor websocket reconnect loop
This commit is contained in:
sagit
2026-02-12 12:28:53 +08:00
committed by GitHub
parent 6f205df37c bdfc704f95
commit b56d0a28e7
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go-backend/internal/ws/server.go
+5
View File
@@ -292,7 +292,9 @@ func (s *Server) SendCommand(nodeID int64, cmdType string, data interface{}, tim
} }
ns.conn.mu.Lock() ns.conn.mu.Lock()
_ = ns.conn.conn.SetWriteDeadline(time.Now().Add(wsWriteWait))
err = ns.conn.conn.WriteMessage(websocket.TextMessage, messageData) err = ns.conn.conn.WriteMessage(websocket.TextMessage, messageData)
_ = ns.conn.conn.SetWriteDeadline(time.Time{})
ns.conn.mu.Unlock() ns.conn.mu.Unlock()
if err != nil { if err != nil {
cleanup() cleanup()
@@ -429,7 +431,9 @@ func (s *Server) broadcastToAdmins(message string) {
for _, c := range admins { for _, c := range admins {
c.mu.Lock() c.mu.Lock()
_ = c.conn.SetWriteDeadline(time.Now().Add(wsWriteWait))
err := c.conn.WriteMessage(websocket.TextMessage, []byte(message)) err := c.conn.WriteMessage(websocket.TextMessage, []byte(message))
_ = c.conn.SetWriteDeadline(time.Time{})
c.mu.Unlock() c.mu.Unlock()
if err != nil { if err != nil {
log.Printf("websocket broadcast failed: %v", err) log.Printf("websocket broadcast failed: %v", err)
@@ -478,6 +482,7 @@ func startKeepalive(cw *connWrap, done <-chan struct{}) {
cw.mu.Lock() cw.mu.Lock()
_ = cw.conn.SetWriteDeadline(time.Now().Add(wsWriteWait)) _ = cw.conn.SetWriteDeadline(time.Now().Add(wsWriteWait))
err := cw.conn.WriteMessage(websocket.PingMessage, nil) err := cw.conn.WriteMessage(websocket.PingMessage, nil)
_ = cw.conn.SetWriteDeadline(time.Time{})
cw.mu.Unlock() cw.mu.Unlock()
if err != nil { if err != nil {
_ = cw.conn.Close() _ = cw.conn.Close()
vite-frontend/nginx.conf
+2
View File
@@ -87,6 +87,8 @@ http {
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_read_timeout 3600s;
proxy_send_timeout 3600s;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;