From d9d75afa9720e4ea319c462787c4c310da54b865 Mon Sep 17 00:00:00 2001 From: Doug Lauder Date: Thu, 23 Feb 2023 12:03:48 -0500 Subject: [PATCH] MM-47489 Assume Remote Cluster Service enabled if Shared Channels enabled. (#22376) * Assume Remote Cluster Service enabled if Shared Channels enabled. * enable remote cluster service config if shared channels config is enabled * Update app/server.go --------- Co-authored-by: Mattermost Build --- app/server.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/server.go b/app/server.go index 41e85604b3..2de968b765 100644 --- a/app/server.go +++ b/app/server.go @@ -579,14 +579,14 @@ func (s *Server) startInterClusterServices(license *model.License) error { // Remote Cluster service - // License check - if !*license.Features.RemoteClusterService { + // License check (assume enabled if shared channels enabled) + if !*license.Features.RemoteClusterService && !license.HasSharedChannels() { mlog.Debug("License does not have Remote Cluster services enabled") return nil } // Config check - if !*s.platform.Config().ExperimentalSettings.EnableRemoteClusterService { + if !*s.platform.Config().ExperimentalSettings.EnableRemoteClusterService && !*s.platform.Config().ExperimentalSettings.EnableSharedChannels { mlog.Debug("Remote Cluster Service disabled via config") return nil } @@ -606,7 +606,7 @@ func (s *Server) startInterClusterServices(license *model.License) error { s.remoteClusterService = rcs s.serviceMux.Unlock() - // Shared Channels service + // Shared Channels service (depends on remote cluster service) // License check if !license.HasSharedChannels() {