修复: websocket在读线程关闭session导致的写入并发 davyxu#26

yxc6123 · Nov 16, 2017 · 59e173f · 59e173f
1 parent 6635992
commit 59e173f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/examples/websocket/main.go b/examples/websocket/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/davyxu/golog"
 )
 
-var log *golog.Logger = golog.New("main")
+var log = golog.New("main")
 
 // 运行服务器, 在浏览器(Chrome)中打开index.html, F12打开调试窗口->Console标签 查看命令行输出
 func main() {
@@ -31,6 +31,9 @@ func main() {
 		log.Debugln(msg.Content)
 
 		ev.Send(&jsongamedef.TestEchoJsonACK{Content: "roger"})
+
+		ev.Ses.Close()
+
 	})
 
 	queue.StartLoop()

diff --git a/websocket/session.go b/websocket/session.go
@@ -40,8 +40,7 @@ func (self *wsSession) FromPeer() cellnet.Peer {
 }
 
 func (self *wsSession) Close() {
-
-	self.conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+	self.sendChan <- nil
 }
 
 func (self *wsSession) Send(data interface{}) {
@@ -77,6 +76,11 @@ func (self *wsSession) sendThread() {
 
 	for ev := range self.sendChan {
 
+		if ev == nil {
+			self.conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+			break
+		}
+
 		meta := cellnet.MessageMetaByID(ev.MsgID)
 
 		if meta == nil {