在线人数 bugfix

zhima1234 · zhima1234 · commit 7bfbca8bedc0 · 2017-08-20T14:41:16.000+08:00
diff --git a/src/http/controller/websocket.go b/src/http/controller/websocket.go
@@ -8,7 +8,7 @@ package controller
 
 import (
 	"logic"
-	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/labstack/echo"
@@ -20,8 +20,7 @@ import (
 )
 
 type WebsocketController struct {
-	ServerId int
-	mutex    sync.Mutex
+	ServerId uint32
 }
 
 func (this *WebsocketController) RegisterRoute(g *echo.Group) {
@@ -33,10 +32,7 @@ func (this *WebsocketController) RegisterRoute(g *echo.Group) {
 func (this *WebsocketController) Ws(wsConn *websocket.Conn) {
 	defer wsConn.Close()
 
-	this.mutex.Lock()
-	this.ServerId++
-	serverId := this.ServerId
-	this.mutex.Unlock()
+	serverId := int(atomic.AddUint32(&this.ServerId, 1))
 
 	isUid := true
 	req := wsConn.Request()
@@ -74,6 +70,8 @@ func (this *WebsocketController) Ws(wsConn *websocket.Conn) {
 	}
 	// 用户退出时需要变更其他用户看到的在线用户数
 	if !logic.Book.UserIsOnline(user) {
+		logger.Infoln("user:", user, "had leave")
+
 		message := logic.NewMessage(logic.WsMsgOnline, map[string]int{"online": logic.Book.Len()})
 		go logic.Book.BroadcastAllUsersMessage(message)
 	}
diff --git a/src/logic/book.go b/src/logic/book.go
@@ -27,7 +27,7 @@ const (
 	WsMsgOnline        // 发送在线用户数（和需要时也发历史最高）
 )
 
-const MessageQueueLen = 1
+const MessageQueueLen = 10
 
 type Message struct {
 	Type int         `json:"type"`
@@ -79,11 +79,13 @@ func (this *UserData) SendMessage(message *Message) {
 	defer this.rwMutex.RUnlock()
 
 	for serverId, messageQueue := range this.serverMsgQueue {
-		// 有可能用户已经退出，导致 messageQueue满，阻塞
+		// 有可能用户已经退出，导致 messageQueue 满，阻塞
 		if len(messageQueue) < MessageQueueLen {
 			messageQueue <- message
 		} else {
 			logger.Infoln("server_id:", serverId, "had close")
+
+			delete(this.serverMsgQueue, serverId)
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ const (`
`27`	`27`	`WsMsgOnline // 发送在线用户数（和需要时也发历史最高）`
`28`	`28`	`)`
`29`	`29`
`30`		`-const MessageQueueLen = 1`
	`30`	`+const MessageQueueLen = 10`
`31`	`31`
`32`	`32`	`type Message struct {`
`33`	`33`	Type int `json:"type"`
`@@ -79,11 +79,13 @@ func (this UserData) SendMessage(message Message) {`
`79`	`79`	`defer this.rwMutex.RUnlock()`
`80`	`80`
`81`	`81`	`for serverId, messageQueue := range this.serverMsgQueue {`
`82`		`- // 有可能用户已经退出，导致 messageQueue满，阻塞`
	`82`	`+ // 有可能用户已经退出，导致 messageQueue 满，阻塞`
`83`	`83`	`if len(messageQueue) < MessageQueueLen {`
`84`	`84`	`messageQueue <- message`
`85`	`85`	`} else {`
`86`	`86`	`logger.Infoln("server_id:", serverId, "had close")`
	`87`	`+`
	`88`	`+ delete(this.serverMsgQueue, serverId)`
`87`	`89`	`}`
`88`	`90`	`}`
`89`	`91`	`}`