tl_server_2
/
goserver_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复服务器注册删除问题

This commit is contained in:
sk 2024-09-19 15:53:54 +08:00
parent 3804afa03b
commit 434263a753
1 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
srvlib/serversessionmgr.go
View File

@ -9,8 +9,7 @@ import (
) )
/* /*
服务器信息注册，单个服务器可能包含多个服务端口 服务器信息注册，单个服务器可能包含多个子服务端口
服务器信息->session
*/ */
var ( var (
@ -35,64 +34,79 @@ func (ssm *ServerSessionMgr) AddListener(l ServerSessionRegisteListener) ServerS
func (ssm *ServerSessionMgr) RegisteSession(s *netlib.Session) bool { func (ssm *ServerSessionMgr) RegisteSession(s *netlib.Session) bool {
attr := s.GetAttribute(SessionAttributeServerInfo) attr := s.GetAttribute(SessionAttributeServerInfo)
if attr != nil { if attr == nil {
if srvInfo, ok := attr.(*protocol.SSSrvRegiste); ok && srvInfo != nil { logger.Logger.Warnf("服务器注册信息为空")
areaId := int(srvInfo.GetAreaId()) return false
srvType := int(srvInfo.GetType())
srvId := int(srvInfo.GetId())
if a, exist := ssm.sessions[areaId]; !exist {
ssm.sessions[areaId] = make(map[int]map[int]*netlib.Session)
a = ssm.sessions[areaId]
a[srvType] = make(map[int]*netlib.Session)
} else {
if _, exist := a[srvType]; !exist {
a[srvType] = make(map[int]*netlib.Session)
}
}
if _, exist := ssm.sessions[areaId][srvType][srvId]; !exist {
logger.Logger.Infof("(ssm *ServerSessionMgr) RegisteSession %v", srvInfo)
ssm.sessions[areaId][srvType][srvId] = s
if len(ssm.listeners) != 0 {
for _, l := range ssm.listeners {
l.OnRegiste(s)
}
}
} else {
logger.Logger.Warnf("###(ssm *ServerSessionMgr) RegisteSession repeated areaid:%v srvType:%v srvId:%v", areaId, srvType, srvId)
}
}
} else {
logger.Logger.Warnf("ServerSessionMgr.RegisteSession SessionAttributeServerInfo=nil")
} }
srvInfo, ok := attr.(*protocol.SSSrvRegiste)
if !ok || srvInfo == nil {
logger.Logger.Warnf("服务器注册信息错误")
return false
}
areaId := int(srvInfo.GetAreaId())
srvType := int(srvInfo.GetType())
srvId := int(srvInfo.GetId())
if _, ok := ssm.sessions[areaId]; !ok {
ssm.sessions[areaId] = make(map[int]map[int]*netlib.Session)
}
if _, ok := ssm.sessions[areaId][srvType]; !ok {
ssm.sessions[areaId][srvType] = make(map[int]*netlib.Session)
}
session, has := ssm.sessions[areaId][srvType][srvId]
if has && session != nil && session != s {
logger.Logger.Warnf("删除旧服务器注册: %v", srvInfo)
ssm.UnregisteSession(session)
}
logger.Logger.Infof("服务器注册成功：%v", srvInfo)
ssm.sessions[areaId][srvType][srvId] = s
if len(ssm.listeners) != 0 {
for _, l := range ssm.listeners {
l.OnRegiste(s)
}
}
return true return true
} }
// UnregisteSession 服务器关闭
// 需要支持幂等性
func (ssm *ServerSessionMgr) UnregisteSession(s *netlib.Session) bool { func (ssm *ServerSessionMgr) UnregisteSession(s *netlib.Session) bool {
attr := s.GetAttribute(SessionAttributeServerInfo) attr := s.GetAttribute(SessionAttributeServerInfo)
if attr != nil { if attr == nil {
if srvInfo, ok := attr.(*protocol.SSSrvRegiste); ok && srvInfo != nil { return false
logger.Logger.Infof("ServerSessionMgr.UnregisteSession try %v", srvInfo) }
areaId := int(srvInfo.GetAreaId())
srvType := int(srvInfo.GetType()) srvInfo, ok := attr.(*protocol.SSSrvRegiste)
srvId := int(srvInfo.GetId()) if !ok || srvInfo == nil {
if a, exist := ssm.sessions[areaId]; exist { return false
if b, exist := a[srvType]; exist { }
if _, exist := b[srvId]; exist {
logger.Logger.Infof("ServerSessionMgr.UnregisteSession %v success", srvInfo) logger.Logger.Tracef("尝试删除服务器注册：%v", srvInfo)
delete(b, srvId) areaId := int(srvInfo.GetAreaId())
if len(ssm.listeners) != 0 { srvType := int(srvInfo.GetType())
for _, l := range ssm.listeners { srvId := int(srvInfo.GetId())
l.OnUnregiste(s)
} if a, exist := ssm.sessions[areaId]; exist {
} if b, exist := a[srvType]; exist {
} else { if conn, exist := b[srvId]; exist && s == conn {
logger.Logger.Warnf("(ssm *ServerSessionMgr) UnregisteSession found not fit session, area:%v type:%v id:%v", areaId, srvType, srvId) logger.Logger.Infof("删除服务器注册成功 %v", srvInfo)
delete(b, srvId)
if len(ssm.listeners) != 0 {
for _, l := range ssm.listeners {
l.OnUnregiste(s)
} }
} }
} else {
logger.Logger.Tracef("服务器注册信息已经删除")
} }
} }
} }
return true return true
} }