diff options
author | Jesús Espino <jespinog@gmail.com> | 2018-02-07 18:05:23 +0100 |
---|---|---|
committer | Jesús Espino <jespinog@gmail.com> | 2018-02-07 18:05:23 +0100 |
commit | a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e (patch) | |
tree | 985cb699d278f68522b08b60b1e7b84e0bd243fc /cmd/platform/server.go | |
parent | 7941c30117efe1b957ac0458c2f0479e3824196d (diff) | |
parent | 7bd298ceaa24c0721e0acd65692cb2d1ca4983f3 (diff) | |
download | chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.gz chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.bz2 chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
Diffstat (limited to 'cmd/platform/server.go')
-rw-r--r-- | cmd/platform/server.go | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go index e55ad70d0..54a7d6ae3 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -53,7 +53,7 @@ func runServer(configFileLocation string, disableConfigWatch bool) error { a, err := app.New(options...) if err != nil { - l4g.Error(err.Error()) + l4g.Critical(err.Error()) return err } defer a.Shutdown() @@ -89,20 +89,27 @@ func runServer(configFileLocation string, disableConfigWatch bool) error { } }) - a.StartServer() + serverErr := a.StartServer() + if serverErr != nil { + l4g.Critical(serverErr.Error()) + return serverErr + } + api4.Init(a, a.Srv.Router, false) api3 := api.Init(a, a.Srv.Router) wsapi.Init(a, a.Srv.WebSocketRouter) web.Init(api3) - if !utils.IsLicensed() && len(a.Config().SqlSettings.DataSourceReplicas) > 1 { + license := a.License() + + if license == nil && len(a.Config().SqlSettings.DataSourceReplicas) > 1 { l4g.Warn(utils.T("store.sql.read_replicas_not_licensed.critical")) a.UpdateConfig(func(cfg *model.Config) { cfg.SqlSettings.DataSourceReplicas = cfg.SqlSettings.DataSourceReplicas[:1] }) } - if !utils.IsLicensed() { + if license == nil { a.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.MaxNotificationsPerChannel = &MaxNotificationsPerChannelDefault }) |