remove jobs.Srv and other jobs-related globals (#7535)

jobs/server.go

@@ -5,6 +5,8 @@ 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"
@@ -14,13 +16,16 @@ type JobServer struct {
 	Store      store.Store
 	Workers    *Workers
 	Schedulers *Schedulers
+
+	DataRetention           ejobs.DataRetentionInterface
+	ElasticsearchAggregator ejobs.ElasticsearchAggregatorInterface
+	ElasticsearchIndexer    ejobs.ElasticsearchIndexerInterface
+	LdapSync                ejobs.LdapSyncInterface
 }
 
-var Srv JobServer
-
-func (server *JobServer) LoadLicense() {
+func (srv *JobServer) LoadLicense() {
 	licenseId := ""
-	if result := <-server.Store.System().Get(); result.Err == nil {
+	if result := <-srv.Store.System().Get(); result.Err == nil {
 		props := result.Data.(model.StringMap)
 		licenseId = props[model.SYSTEM_ACTIVE_LICENSE_ID]
 	}
@@ -31,7 +36,7 @@ func (server *JobServer) LoadLicense() {
 		// Lets attempt to load the file from disk since it was missing from the DB
 		_, licenseBytes = utils.GetAndValidateLicenseFileFromDisk()
 	} else {
-		if result := <-server.Store.License().Get(licenseId); result.Err == nil {
+		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.")
@@ -48,22 +53,22 @@ func (server *JobServer) LoadLicense() {
 	}
 }
 
-func (server *JobServer) StartWorkers() {
-	Srv.Workers = InitWorkers().Start()
+func (srv *JobServer) StartWorkers() {
+	srv.Workers = srv.InitWorkers().Start()
 }
 
-func (server *JobServer) StartSchedulers() {
-	Srv.Schedulers = InitSchedulers().Start()
+func (srv *JobServer) StartSchedulers() {
+	srv.Schedulers = srv.InitSchedulers().Start()
 }
 
-func (server *JobServer) StopWorkers() {
-	if Srv.Workers != nil {
-		Srv.Workers.Stop()
+func (srv *JobServer) StopWorkers() {
+	if srv.Workers != nil {
+		srv.Workers.Stop()
 	}
 }
 
-func (server *JobServer) StopSchedulers() {
-	if Srv.Schedulers != nil {
-		Srv.Schedulers.Stop()
+func (srv *JobServer) StopSchedulers() {
+	if srv.Schedulers != nil {
+		srv.Schedulers.Stop()
 	}
 }