ayo/gocommon
8
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

프로세스 종료 안되는 문제 수정

Browse Source
This commit is contained in:
mountain
2024-02-15 12:06:31 +09:00
parent c08a3abf83
commit 0c5ddac9f5
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wshandler/wshandler.go
View File

@ -52,6 +52,7 @@ type commandType string
const ( const (
commandType_EnterRoom = commandType("enter_room") commandType_EnterRoom = commandType("enter_room")
commandType_LeaveRoom = commandType("leave_room") commandType_LeaveRoom = commandType("leave_room")
ForceShutdownCloseMessage = "force_shutdown"
) )
type commandMessage struct { type commandMessage struct {
@ -302,6 +303,7 @@ func (ws *WebsocketHandler) mainLoop(ctx context.Context) {
logger.Println(r) logger.Println(r)
} }
}() }()
c.closeMessage = ForceShutdownCloseMessage
ws.ClientDisconnected(c) ws.ClientDisconnected(c)
c.Close() c.Close()
} }
@ -495,6 +497,11 @@ func upgrade_core(ws *WebsocketHandler, conn *websocket.Conn, accid primitive.Ob
ws.connWaitGroup.Add(1) ws.connWaitGroup.Add(1)
go func(c *wsconn, accid primitive.ObjectID, deliveryChan chan<- any) { go func(c *wsconn, accid primitive.ObjectID, deliveryChan chan<- any) {
defer func() {
recover()
ws.connWaitGroup.Done()
}()
for { for {
messageType, r, err := c.NextReader() messageType, r, err := c.NextReader()
if err != nil { if err != nil {
@ -519,10 +526,10 @@ func upgrade_core(ws *WebsocketHandler, conn *websocket.Conn, accid primitive.Ob
ws.Call(newconn.sender, string(cmd), r) ws.Call(newconn.sender, string(cmd), r)
} }
} }
ws.connWaitGroup.Done()
c.Conn = nil c.Conn = nil
if c.closeMessage != ForceShutdownCloseMessage {
ws.connInOutChan <- c ws.connInOutChan <- c
}
}(newconn, accid, ws.deliveryChan) }(newconn, accid, ws.deliveryChan)
} }