Buriburizaemon/V2bX
1
0
Fork 0
mirror of https://github.com/wyx2685/V2bX.git synced 2026-02-04 12:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
yuzuki999
2022-06-09 21:19:57 +08:00
parent c3995c79e9
commit aa8ae319db
3 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
service/controller/controller.go
View File

@@ -190,9 +190,7 @@ func (c *Controller) nodeInfoMonitor() (err error) {
return nil
}
if nodeInfoChanged {
if newUserInfo != nil {
c.userList = newUserInfo
}
c.userList = newUserInfo
newUserInfo = nil
err = c.addNewUser(c.userList, newNodeInfo)
if err != nil {
@@ -206,7 +204,7 @@ func (c *Controller) nodeInfoMonitor() (err error) {
return nil
}
runtime.GC()
} else if newUserInfo != nil {
} else {
deleted, added := compareUserList(c.userList, newUserInfo)
if len(deleted) > 0 {
deletedEmail := make([]string, len(deleted))
@@ -337,15 +335,15 @@ func (c *Controller) addNewUserFromIndex(userInfo *[]api.UserInfo, userIndex *[]
}
func compareUserList(old, new *[]api.UserInfo) (deleted, added []int) {
tmp := map[int]struct{}{}
tmp2 := map[int]struct{}{}
tmp := map[string]struct{}{}
tmp2 := map[string]struct{}{}
for i := range *old {
tmp[(*old)[i].UID] = struct{}{}
tmp[(*old)[i].GetUserEmail()] = struct{}{}
}
l := len(tmp)
for i := range *new {
tmp[(*new)[i].UID] = struct{}{}
tmp2[(*new)[i].UID] = struct{}{}
tmp[(*old)[i].GetUserEmail()] = struct{}{}
tmp2[(*new)[i].GetUserEmail()] = struct{}{}
if l != len(tmp) {
added = append(added, i)
l++
@@ -354,7 +352,7 @@ func compareUserList(old, new *[]api.UserInfo) (deleted, added []int) {
tmp = nil
l = len(tmp2)
for i := range *old {
tmp2[(*old)[i].UID] = struct{}{}
tmp2[(*old)[i].GetUserEmail()] = struct{}{}
if l != len(tmp2) {
deleted = append(deleted, i)
l++