diff options
author | George Goldberg <george@gberg.me> | 2018-07-03 16:54:59 +0100 |
---|---|---|
committer | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-07-03 17:54:59 +0200 |
commit | 0e17babdd3175b3876c42adbac1df4c51f4f9a12 (patch) | |
tree | 259113990c8791b9284a04ff44c4cfabd5d0e972 | |
parent | c66b567a1de30bf5b04f4c846d7197132907bf1c (diff) | |
download | chat-0e17babdd3175b3876c42adbac1df4c51f4f9a12.tar.gz chat-0e17babdd3175b3876c42adbac1df4c51f4f9a12.tar.bz2 chat-0e17babdd3175b3876c42adbac1df4c51f4f9a12.zip |
Make sure diagnostic ID is loaded before client config. (#9032)
-rw-r--r-- | app/app.go | 4 | ||||
-rw-r--r-- | cmd/mattermost/commands/server.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/app.go b/app/app.go index 911d359ae..96b9b6d13 100644 --- a/app/app.go +++ b/app/app.go @@ -184,7 +184,6 @@ func New(options ...Option) (outApp *App, outErr error) { }) }) - app.regenerateClientConfig() mlog.Info("Server is initializing...") @@ -207,6 +206,9 @@ func New(options ...Option) (outApp *App, outErr error) { return nil, errors.Wrapf(err, "unable to ensure asymmetric signing key") } + app.EnsureDiagnosticId() + app.regenerateClientConfig() + app.initJobs() app.AddLicenseListener(func() { app.initJobs() diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go index 10b44ad83..9500d5dcb 100644 --- a/cmd/mattermost/commands/server.go +++ b/cmd/mattermost/commands/server.go @@ -146,8 +146,6 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform manualtesting.Init(api) } - a.EnsureDiagnosticId() - a.Go(func() { runSecurityJob(a) }) |