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

⚡️ refactor: 将排序的服务器列表的锁拆分出来

Browse Source
This commit is contained in:
naiba
2021-01-17 22:18:36 +08:00
parent d059835877
commit bf71aeaaf9
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/dashboard/controller/common_page.go
View File

@@ -90,8 +90,8 @@ func (p *commonPage) service(c *gin.Context) {
}
func (cp *commonPage) home(c *gin.Context) {
dao.ServerLock.RLock()
defer dao.ServerLock.RUnlock()
dao.SortedServerLock.RLock()
defer dao.SortedServerLock.RUnlock()
c.HTML(http.StatusOK, "theme-"+dao.Conf.Site.Theme+"/home", mygin.CommonEnvironment(c, gin.H{
"Servers": dao.SortedServerList,
@@ -115,9 +115,9 @@ func (cp *commonPage) ws(c *gin.Context) {
}
defer conn.Close()
for {
dao.ServerLock.RLock()
dao.SortedServerLock.RLock()
err = conn.WriteJSON(dao.SortedServerList)
dao.ServerLock.RUnlock()
dao.SortedServerLock.RUnlock()
if err != nil {
break
}

15
cmd/dashboard/controller/member_api.go
View File

@@ -53,11 +53,11 @@ func (ma *memberAPI) delete(c *gin.Context) {
var err error
switch c.Param("model") {
case "server":
dao.ServerLock.Lock()
defer dao.ServerLock.Unlock()
err = dao.DB.Delete(&model.Server{}, "id = ?", id).Error
if err == nil {
dao.ServerLock.Lock()
delete(dao.ServerList, id)
dao.ServerLock.Unlock()
dao.ReSortServer()
}
case "notification":
@@ -109,14 +109,10 @@ func (ma *memberAPI) addOrEditServer(c *gin.Context) {
s.ID = sf.ID
s.Tag = sf.Tag
if sf.ID == 0 {
dao.ServerLock.Lock()
defer dao.ServerLock.Unlock()
s.Secret = com.MD5(fmt.Sprintf("%s%s%d", time.Now(), sf.Name, admin.ID))
s.Secret = s.Secret[:10]
err = dao.DB.Create(&s).Error
} else {
dao.ServerLock.RLock()
defer dao.ServerLock.RUnlock()
isEdit = true
err = dao.DB.Save(&s).Error
}
@@ -129,13 +125,18 @@ func (ma *memberAPI) addOrEditServer(c *gin.Context) {
return
}
if isEdit {
dao.ServerLock.RLock()
s.Host = dao.ServerList[s.ID].Host
s.State = dao.ServerList[s.ID].State
dao.ServerList[s.ID] = &s
dao.ServerLock.RUnlock()
} else {
s.Host = &model.Host{}
s.State = &model.HostState{}
dao.ServerLock.Lock()
dao.ServerList[s.ID] = &s
dao.ServerLock.Unlock()
}
dao.ServerList[s.ID] = &s
dao.ReSortServer()
c.JSON(http.StatusOK, model.Response{
Code: http.StatusOK,

4
cmd/dashboard/controller/member_page.go
View File

@@ -29,8 +29,8 @@ func (mp *memberPage) serve() {
}
func (mp *memberPage) server(c *gin.Context) {
dao.ServerLock.RLock()
defer dao.ServerLock.RUnlock()
dao.SortedServerLock.RLock()
defer dao.SortedServerLock.RUnlock()
c.HTML(http.StatusOK, "dashboard/server", mygin.CommonEnvironment(c, gin.H{
"Title": "服务器管理",
"Servers": dao.SortedServerList,