Fixing initalization order. (#9916)

This commit is contained in:
Christopher Speller
2018-11-30 08:07:08 -08:00
committed by Carlos Tadeu Panato Junior
parent 8cd0f284d5
commit 21aaddef92

View File

@@ -304,6 +304,8 @@ func NewServer(options ...Option) (*Server, error) {
s.Log.ChangeLevels(utils.MloggerConfigFromLoggerConfig(&after.LogSettings))
})
s.HTTPService = httpservice.MakeHTTPService(s.FakeApp())
err := s.RunOldAppInitalization()
if err != nil {
return nil, err
@@ -315,8 +317,6 @@ func NewServer(options ...Option) (*Server, error) {
s.InitEmailBatching()
})
s.HTTPService = httpservice.MakeHTTPService(s.FakeApp())
mlog.Info(fmt.Sprintf("Current version is %v (%v/%v/%v/%v)", model.CurrentVersion, model.BuildNumber, model.BuildDate, model.BuildHash, model.BuildHashEnterprise))
mlog.Info(fmt.Sprintf("Enterprise Enabled: %v", model.BuildEnterpriseReady))
pwd, _ := os.Getwd()