summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2018-02-06 17:25:49 -0600
committerGitHub <noreply@github.com>2018-02-06 17:25:49 -0600
commit1ec295f88ca99e9423ffd91019cecf802ae3dc77 (patch)
tree05abc364fefdc6b1088bfb4a307ba11db0dc427f /cmd
parent034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff)
downloadchat-1ec295f88ca99e9423ffd91019cecf802ae3dc77.tar.gz
chat-1ec295f88ca99e9423ffd91019cecf802ae3dc77.tar.bz2
chat-1ec295f88ca99e9423ffd91019cecf802ae3dc77.zip
add App.License, remove utils.IsLicensed / utils.License calls (#8203)
Diffstat (limited to 'cmd')
-rw-r--r--cmd/platform/server.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go
index 7ac075502..e3742cef6 100644
--- a/cmd/platform/server.go
+++ b/cmd/platform/server.go
@@ -93,14 +93,16 @@ func runServer(configFileLocation string, disableConfigWatch bool) error {
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
})