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 <build@mattermost.com>
Этот коммит содержится в:
@@ -579,14 +579,14 @@ func (s *Server) startInterClusterServices(license *model.License) error {
|
|||||||
|
|
||||||
// Remote Cluster service
|
// Remote Cluster service
|
||||||
|
|
||||||
// License check
|
// License check (assume enabled if shared channels enabled)
|
||||||
if !*license.Features.RemoteClusterService {
|
if !*license.Features.RemoteClusterService && !license.HasSharedChannels() {
|
||||||
mlog.Debug("License does not have Remote Cluster services enabled")
|
mlog.Debug("License does not have Remote Cluster services enabled")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Config check
|
// 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")
|
mlog.Debug("Remote Cluster Service disabled via config")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -606,7 +606,7 @@ func (s *Server) startInterClusterServices(license *model.License) error {
|
|||||||
s.remoteClusterService = rcs
|
s.remoteClusterService = rcs
|
||||||
s.serviceMux.Unlock()
|
s.serviceMux.Unlock()
|
||||||
|
|
||||||
// Shared Channels service
|
// Shared Channels service (depends on remote cluster service)
|
||||||
|
|
||||||
// License check
|
// License check
|
||||||
if !license.HasSharedChannels() {
|
if !license.HasSharedChannels() {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user