IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix websocket deadlock (#7577)

Browse Source
This commit is contained in:
Chris
2017-10-04 22:48:14 -07:00
committed by GitHub
parent da368539e3
commit 2a76eeeeee
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/web_hub.go
View File

@@ -35,7 +35,7 @@ type Hub struct {
register chan *WebConn
unregister chan *WebConn
broadcast chan *model.WebSocketEvent
stop chan string
stop chan struct{}
didStop chan struct{}
invalidateUser chan string
ExplicitStop bool
@@ -49,7 +49,7 @@ func (a *App) NewWebHub() *Hub {
unregister: make(chan *WebConn, 1),
connections: make([]*WebConn, 0, model.SESSION_CACHE_SIZE),
broadcast: make(chan *model.WebSocketEvent, BROADCAST_QUEUE_SIZE),
stop: make(chan string),
stop: make(chan struct{}),
didStop: make(chan struct{}, 1),
invalidateUser: make(chan string),
ExplicitStop: false,
@@ -324,7 +324,10 @@ func (h *Hub) Register(webConn *WebConn) {
}
func (h *Hub) Unregister(webConn *WebConn) {
h.unregister <- webConn
select {
case h.unregister <- webConn:
case <-h.stop:
}
}
func (h *Hub) Broadcast(message *model.WebSocketEvent) {
@@ -349,7 +352,7 @@ func getGoroutineId() int {
}
func (h *Hub) Stop() {
h.stop <- "all"
close(h.stop)
<-h.didStop
}
@@ -430,9 +433,18 @@ func (h *Hub) Start() {
}
case <-h.stop:
userIds := make(map[string]bool)
for _, webCon := range h.connections {
userIds[webCon.UserId] = true
webCon.Close()
}
for userId := range userIds {
h.app.SetStatusOffline(userId, false)
}
h.connections = make([]*WebConn, 0, model.SESSION_CACHE_SIZE)
h.ExplicitStop = true
h.didStop <- struct{}{}