diff options
author | JoramWilander <jwawilander@gmail.com> | 2018-07-07 12:04:18 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2018-07-07 12:04:18 -0400 |
commit | b78b216a3c8eb354085f97f33dac5e7661ac9188 (patch) | |
tree | dc7a253730a684bc6744c0b0bf36a87944242583 /app/app.go | |
parent | 359f12db33d45b6ffade0872ddf3652a5c52f4a8 (diff) | |
parent | 9e5ec7d09d4c51e278f17f25fb6c0f3484b50a3b (diff) | |
download | chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.tar.gz chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.tar.bz2 chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.zip |
Merge branch 'master' into plugins-2
Diffstat (limited to 'app/app.go')
-rw-r--r-- | app/app.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/app.go b/app/app.go index 6bf4c9f68..615956edd 100644 --- a/app/app.go +++ b/app/app.go @@ -182,7 +182,6 @@ func New(options ...Option) (outApp *App, outErr error) { }) }) - app.regenerateClientConfig() mlog.Info("Server is initializing...") @@ -205,6 +204,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() |