fix: sync close ws conn when kick old user avoid wrong trigger order …

…about online status. (#1368)
openimsdk · Nov 8, 2023 · b562da5 · b562da5
1 parent 3ba861f
commit b562da5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go
@@ -297,7 +297,9 @@ func (c *Client) KickOnlineMessage() error {
 	resp := Resp{
 		ReqIdentifier: WSKickOnlineMsg,
 	}
-	return c.writeBinaryMsg(resp)
+	err := c.writeBinaryMsg(resp)
+	c.close()
+	return err
 }
 
 func (c *Client) writeBinaryMsg(resp Resp) error {

diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go
@@ -225,12 +225,7 @@ func (ws *WsServer) registerClient(client *Client) {
 		ws.onlineUserNum.Add(1)
 		ws.onlineUserConnNum.Add(1)
 	} else {
-		i := &kickHandler{
-			clientOK:   clientOK,
-			oldClients: oldClients,
-			newClient:  client,
-		}
-		ws.kickHandlerChan <- i
+		ws.multiTerminalLoginChecker(clientOK, oldClients, client)
 		log.ZDebug(client.ctx, "user exist", "userID", client.UserID, "platformID", client.PlatformID)
 		if clientOK {
 			ws.clients.Set(client.UserID, client)