From 1f431bf72276b98edd35fc5e130d08d2491c2c39 Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Mon, 22 Jan 2024 11:04:15 +0530 Subject: [PATCH] MM-53879: Fix duplicate loading of license (#25442) We take a second stab at fixing the issue. Last time, we were a bit too aggressive in trying to fix a lot of stuff. I believe changing the cluster event handler had an edge case somewhere which caused things to fail. Taking a very conservative approach this time to only fix what is obviously wrong. Also tested locally in a HA setup. https://mattermost.atlassian.net/browse/MM-53879 ```release-note NONE ``` Co-authored-by: Mattermost Build --- server/channels/app/platform/service.go | 4 +--- server/channels/app/server.go | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/server/channels/app/platform/service.go b/server/channels/app/platform/service.go index 0aa732ad01..1366fb6e40 100644 --- a/server/channels/app/platform/service.go +++ b/server/channels/app/platform/service.go @@ -367,9 +367,7 @@ func (ps *PlatformService) Start(broadcastHooks map[string]BroadcastHook) error message := model.NewWebSocketEvent(model.WebsocketEventLicenseChanged, "", "", "", nil, "") message.Add("license", ps.GetSanitizedClientLicense()) - ps.Go(func() { - ps.Publish(message) - }) + ps.Publish(message) }) return nil } diff --git a/server/channels/app/server.go b/server/channels/app/server.go index 6d35b60cce..2168c20318 100644 --- a/server/channels/app/server.go +++ b/server/channels/app/server.go @@ -227,11 +227,6 @@ func NewServer(options ...Option) (*Server, error) { return nil, errors.Wrapf(err, "unable to create users service") } - if model.BuildEnterpriseReady == "true" { - // Dependent on user service - s.LoadLicense() - } - s.licenseWrapper = &licenseWrapper{ srv: s, }