From 897e7bb9e7b890a71c3cd8ca947e12f9647ef4f9 Mon Sep 17 00:00:00 2001 From: Claudio Costa Date: Mon, 7 Mar 2022 10:24:23 +0100 Subject: [PATCH] Only set cluster if unset (#19683) --- app/enterprise.go | 2 +- app/web_hub_test.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/enterprise.go b/app/enterprise.go index 46b7090861..e577ab4762 100644 --- a/app/enterprise.go +++ b/app/enterprise.go @@ -122,7 +122,7 @@ func (s *Server) initEnterprise() { s.Metrics = metricsInterface(s) } - if clusterInterface != nil { + if clusterInterface != nil && s.Cluster == nil { s.Cluster = clusterInterface(s) } if elasticsearchInterface != nil { diff --git a/app/web_hub_test.go b/app/web_hub_test.go index 152d9aabbb..423a800053 100644 --- a/app/web_hub_test.go +++ b/app/web_hub_test.go @@ -338,7 +338,6 @@ func TestHubConnIndexInactive(t *testing.T) { } func TestReliableWebSocketSend(t *testing.T) { - t.Skip("MM-42033") testCluster := &testlib.FakeClusterInterface{} th := SetupWithClusterMock(t, testCluster)