summaryrefslogtreecommitdiffstats
path: root/jobs/server.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2018-02-09 10:04:48 -0600
committerGitHub <noreply@github.com>2018-02-09 10:04:48 -0600
commita6309aaf48e216fe5f6779188071d4b621b643b6 (patch)
tree9abbac7f172822e2286c755725fe3533cde8de8a /jobs/server.go
parent7e8106b95c11a4187f8c00256f3067433d20b24e (diff)
downloadchat-a6309aaf48e216fe5f6779188071d4b621b643b6.tar.gz
chat-a6309aaf48e216fe5f6779188071d4b621b643b6.tar.bz2
chat-a6309aaf48e216fe5f6779188071d4b621b643b6.zip
Remove license globals entirely (#8229)
* remove license globals entirely * fix infinite recursion * test fix
Diffstat (limited to 'jobs/server.go')
-rw-r--r--jobs/server.go33
1 files changed, 0 insertions, 33 deletions
diff --git a/jobs/server.go b/jobs/server.go
index 4015d581e..01cf821dc 100644
--- a/jobs/server.go
+++ b/jobs/server.go
@@ -4,12 +4,9 @@
package jobs
import (
- l4g "github.com/alecthomas/log4go"
-
ejobs "github.com/mattermost/mattermost-server/einterfaces/jobs"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/store"
- "github.com/mattermost/mattermost-server/utils"
)
type ConfigService interface {
@@ -50,36 +47,6 @@ func (srv *JobServer) Config() *model.Config {
return srv.ConfigService.Config()
}
-func (srv *JobServer) LoadLicense() {
- licenseId := ""
- if result := <-srv.Store.System().Get(); result.Err == nil {
- props := result.Data.(model.StringMap)
- licenseId = props[model.SYSTEM_ACTIVE_LICENSE_ID]
- }
-
- var licenseBytes []byte
-
- if len(licenseId) != 26 {
- // Lets attempt to load the file from disk since it was missing from the DB
- _, licenseBytes = utils.GetAndValidateLicenseFileFromDisk(*srv.ConfigService.Config().ServiceSettings.LicenseFileLocation)
- } else {
- if result := <-srv.Store.License().Get(licenseId); result.Err == nil {
- record := result.Data.(*model.LicenseRecord)
- licenseBytes = []byte(record.Bytes)
- l4g.Info("License key valid unlocking enterprise features.")
- } else {
- l4g.Info(utils.T("mattermost.load_license.find.warn"))
- }
- }
-
- if licenseBytes != nil {
- utils.LoadLicense(licenseBytes)
- l4g.Info("License key valid unlocking enterprise features.")
- } else {
- l4g.Info(utils.T("mattermost.load_license.find.warn"))
- }
-}
-
func (srv *JobServer) StartWorkers() {
srv.Workers = srv.InitWorkers().Start()
}