remove kick

pull/455/head
skiffer-git 2 years ago committed by Xinwei Xiong(cubxxw-openim)
parent 9bacd07973
commit c05a98dca6

@ -97,7 +97,7 @@ func (ws *WServer) SetWriteTimeout(conn *UserConn, timeout int) {
func (ws *WServer) writeMsg(conn *UserConn, a int, msg []byte) error { func (ws *WServer) writeMsg(conn *UserConn, a int, msg []byte) error {
conn.w.Lock() conn.w.Lock()
defer conn.w.Unlock() defer conn.w.Unlock()
conn.SetWriteDeadline(time.Now().Add(time.Duration(10) * time.Second)) conn.SetWriteDeadline(time.Now().Add(time.Duration(60) * time.Second))
return conn.WriteMessage(a, msg) return conn.WriteMessage(a, msg)
} }
@ -114,7 +114,7 @@ func (ws *WServer) MultiTerminalLoginChecker(uid string, platformID int32, newCo
if oldConnMap, ok := ws.wsUserToConn[uid]; ok { // user->map[platform->conn] if oldConnMap, ok := ws.wsUserToConn[uid]; ok { // user->map[platform->conn]
if oldConn, ok := oldConnMap[constant.PlatformIDToName(platformID)]; ok { if oldConn, ok := oldConnMap[constant.PlatformIDToName(platformID)]; ok {
log.NewWarn(operationID, uid, platformID, "kick old conn begin") log.NewWarn(operationID, uid, platformID, "kick old conn begin")
ws.sendKickMsg(oldConn, newConn) // ws.sendKickMsg(oldConn, newConn)
log.NewWarn(operationID, uid, platformID, "kick old conn end") log.NewWarn(operationID, uid, platformID, "kick old conn end")
m, err := db.DB.GetTokenMapByUidPid(uid, constant.PlatformIDToName(platformID)) m, err := db.DB.GetTokenMapByUidPid(uid, constant.PlatformIDToName(platformID))
if err != nil && err != redis.ErrNil { if err != nil && err != redis.ErrNil {

Loading…
Cancel
Save