From 73dae67c8e86d3c7782ca97daaf10cb25622aff3 Mon Sep 17 00:00:00 2001 From: Eli Yukelzon Date: Wed, 4 Mar 2020 16:25:45 +0200 Subject: [PATCH] MM-22980 - Revert "server init order fixed" (#13994) This reverts commit daebc93d90958aa2831618f64e0ab2f667a1aa01. --- app/server_app_adapters.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/server_app_adapters.go b/app/server_app_adapters.go index 91e251873a..758bdf94f2 100644 --- a/app/server_app_adapters.go +++ b/app/server_app_adapters.go @@ -56,6 +56,8 @@ func (s *Server) RunOldAppInitialization() error { mlog.Info("Server is initializing...") + s.initEnterprise() + if s.FakeApp().Srv().newStore == nil { s.FakeApp().Srv().newStore = func() store.Store { return store.NewTimerLayer( @@ -75,8 +77,6 @@ func (s *Server) RunOldAppInitialization() error { s.FakeApp().Srv().Store = s.FakeApp().Srv().newStore() s.FakeApp().StartPushNotificationsHubWorkers() - s.initEnterprise() - if err := s.FakeApp().ensureAsymmetricSigningKey(); err != nil { return errors.Wrapf(err, "unable to ensure asymmetric signing key") }