diff options
author | Corey Hulen <corey@hulen.com> | 2017-03-01 11:03:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-01 11:03:21 -0500 |
commit | 71e6a423e889e771a5fa29b344c16d07c8f8a763 (patch) | |
tree | ecf19c3ea191833ca09d1d53878c709d2d2648ed /app/web_hub.go | |
parent | 5df5d1fd02068e73cc184827a1cc297083a6747e (diff) | |
download | chat-71e6a423e889e771a5fa29b344c16d07c8f8a763.tar.gz chat-71e6a423e889e771a5fa29b344c16d07c8f8a763.tar.bz2 chat-71e6a423e889e771a5fa29b344c16d07c8f8a763.zip |
Optimizing weh_hub.Start() for master (#5576)
* Optimizing weh_hub.Start()
* Optimizing weh_hub.Start()
* Optimizing weh_hub.Start()
* Adding to IsAuthenticated
* Fixing problem with IsAuthenticated
Diffstat (limited to 'app/web_hub.go')
-rw-r--r-- | app/web_hub.go | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/app/web_hub.go b/app/web_hub.go index 9743d16aa..eae481e17 100644 --- a/app/web_hub.go +++ b/app/web_hub.go @@ -89,6 +89,15 @@ func HubUnregister(webConn *WebConn) { } func Publish(message *model.WebSocketEvent) { + + if SkipTypingMessage(message) { + if metrics := einterfaces.GetMetricsInterface(); metrics != nil { + metrics.IncrementWebsocketEvent(message.Event + "_skipped") + } + + return + } + if metrics := einterfaces.GetMetricsInterface(); metrics != nil { metrics.IncrementWebsocketEvent(message.Event) } @@ -278,20 +287,18 @@ func (h *Hub) Start() { } case msg := <-h.broadcast: - if OkToSendTypingMessage(msg) { - for _, webCon := range h.connections { - if webCon.ShouldSendEvent(msg) { - select { - case webCon.Send <- msg: - default: - l4g.Error(fmt.Sprintf("webhub.broadcast: cannot send, closing websocket for userId=%v", webCon.UserId)) - close(webCon.Send) - for i, webConCandidate := range h.connections { - if webConCandidate == webCon { - h.connections[i] = h.connections[len(h.connections)-1] - h.connections = h.connections[:len(h.connections)-1] - break - } + for _, webCon := range h.connections { + if webCon.ShouldSendEvent(msg) { + select { + case webCon.Send <- msg: + default: + l4g.Error(fmt.Sprintf("webhub.broadcast: cannot send, closing websocket for userId=%v", webCon.UserId)) + close(webCon.Send) + for i, webConCandidate := range h.connections { + if webConCandidate == webCon { + h.connections[i] = h.connections[len(h.connections)-1] + h.connections = h.connections[:len(h.connections)-1] + break } } } @@ -331,13 +338,13 @@ func (h *Hub) Start() { go doRecoverableStart() } -func OkToSendTypingMessage(msg *model.WebSocketEvent) bool { +func SkipTypingMessage(msg *model.WebSocketEvent) bool { // Only broadcast typing messages if less than 1K people in channel if msg.Event == model.WEBSOCKET_EVENT_TYPING { if Srv.Store.Channel().GetMemberCountFromCache(msg.Broadcast.ChannelId) > *utils.Cfg.TeamSettings.MaxNotificationsPerChannel { - return false + return true } } - return true + return false } |