diff options
| author | Corey Hulen <corey@hulen.com> | 2017-08-16 09:51:45 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-08-16 09:51:45 -0700 |
| commit | 0ab490845aed0ce3b58cbffd8ec35be237abda1c (patch) | |
| tree | 5310cce7e546f5a03f97245af473b62d382028e8 /cmd | |
| parent | 32265df8be5d530f5b79284792afb9451464ad3a (diff) | |
| download | chat-0ab490845aed0ce3b58cbffd8ec35be237abda1c.tar.gz chat-0ab490845aed0ce3b58cbffd8ec35be237abda1c.tar.bz2 chat-0ab490845aed0ce3b58cbffd8ec35be237abda1c.zip | |
PLT-6226 Fixing races with licensing (#7213)
* PLT-6226 Fixing races with licensing
* Fixing build issue
* Fixing licensing issue
* removing commented code
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/platform/channel.go | 10 | ||||
| -rw-r--r-- | cmd/platform/server.go | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cmd/platform/channel.go b/cmd/platform/channel.go index 0ff2a1b5f..ed8a0b817 100644 --- a/cmd/platform/channel.go +++ b/cmd/platform/channel.go @@ -106,7 +106,7 @@ func createChannelCmdF(cmd *cobra.Command, args []string) error { return err } - if !utils.IsLicensed { + if !utils.IsLicensed() { return errors.New(utils.T("cli.license.critical")) } @@ -158,7 +158,7 @@ func removeChannelUsersCmdF(cmd *cobra.Command, args []string) error { return err } - if !utils.IsLicensed { + if !utils.IsLicensed() { return errors.New(utils.T("cli.license.critical")) } @@ -194,7 +194,7 @@ func addChannelUsersCmdF(cmd *cobra.Command, args []string) error { return err } - if !utils.IsLicensed { + if !utils.IsLicensed() { return errors.New(utils.T("cli.license.critical")) } @@ -292,7 +292,7 @@ func listChannelsCmdF(cmd *cobra.Command, args []string) error { return err } - if !utils.IsLicensed { + if !utils.IsLicensed() { return errors.New(utils.T("cli.license.critical")) } @@ -329,7 +329,7 @@ func restoreChannelsCmdF(cmd *cobra.Command, args []string) error { return err } - if !utils.IsLicensed { + if !utils.IsLicensed() { return errors.New(utils.T("cli.license.critical")) } diff --git a/cmd/platform/server.go b/cmd/platform/server.go index 79193cd0f..77fedccf4 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -81,12 +81,12 @@ func runServer(configFileLocation string) { app.LoadLicense() } - if !utils.IsLicensed && len(utils.Cfg.SqlSettings.DataSourceReplicas) > 1 { + if !utils.IsLicensed() && len(utils.Cfg.SqlSettings.DataSourceReplicas) > 1 { l4g.Warn(utils.T("store.sql.read_replicas_not_licensed.critical")) utils.Cfg.SqlSettings.DataSourceReplicas = utils.Cfg.SqlSettings.DataSourceReplicas[:1] } - if !utils.IsLicensed { + if !utils.IsLicensed() { utils.Cfg.TeamSettings.MaxNotificationsPerChannel = &MaxNotificationsPerChannelDefault } |