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

Fixing clustering problem (#4320)

Browse Source
This commit is contained in:
Corey Hulen
2016-10-25 05:56:06 -07:00
committed by Christopher Speller
parent 57eb69927c
commit 3e1fc76bf9
3 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/context.go
View File

@@ -474,6 +474,14 @@ func GetSession(token string) *model.Session {
func RemoveAllSessionsForUserId(userId string) {
RemoveAllSessionsForUserIdSkipClusterSend(userId)
if einterfaces.GetClusterInterface() != nil {
einterfaces.GetClusterInterface().RemoveAllSessionsForUserId(userId)
}
}
func RemoveAllSessionsForUserIdSkipClusterSend(userId string) {
keys := sessionCache.Keys()
for _, key := range keys {
@@ -485,9 +493,6 @@ func RemoveAllSessionsForUserId(userId string) {
}
}
if einterfaces.GetClusterInterface() != nil {
einterfaces.GetClusterInterface().RemoveAllSessionsForUserId(userId)
}
}
func AddSessionToCache(session *model.Session) {

23
api/web_hub.go
View File

@@ -101,30 +101,19 @@ func PublishSkipClusterSend(message *model.WebSocketEvent) {
}
func InvalidateCacheForUser(userId string) {
Srv.Store.Channel().InvalidateAllChannelMembersForUser(userId)
for _, hub := range hubs {
hub.InvalidateUser(userId)
}
InvalidateCacheForUserSkipClusterSend(userId)
if einterfaces.GetClusterInterface() != nil {
einterfaces.GetClusterInterface().InvalidateCacheForUser(userId)
}
}
func InvalidateCacheForChannel(channelId string) {
func InvalidateCacheForUserSkipClusterSend(userId string) {
Srv.Store.Channel().InvalidateAllChannelMembersForUser(userId)
// XXX TODO FIX ME
// This can be removed, but the performance branch
// needs to be merged into master so it can be removed
// from the enterprise repo as well.
// hub.invalidateChannel <- channelId
// if einterfaces.GetClusterInterface() != nil {
// einterfaces.GetClusterInterface().InvalidateCacheForChannel(channelId)
// }
for _, hub := range hubs {
hub.InvalidateUser(userId)
}
}
func (h *Hub) Register(webConn *WebConn) {

1
einterfaces/cluster.go
View File

@@ -13,7 +13,6 @@ type ClusterInterface interface {
GetClusterInfos() []*model.ClusterInfo
RemoveAllSessionsForUserId(userId string)
InvalidateCacheForUser(userId string)
InvalidateCacheForChannel(channelId string)
Publish(event *model.WebSocketEvent)
UpdateStatus(status *model.Status)
GetLogs() ([]string, *model.AppError)