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

cmd/platform/jobserver.go

@@ -8,7 +8,6 @@ import (
 	"syscall"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/mattermost-server/jobs"
 	"github.com/mattermost/mattermost-server/store"
 	"github.com/mattermost/mattermost-server/store/sqlstore"
 	"github.com/spf13/cobra"
@@ -37,18 +36,18 @@ func jobserverCmdF(cmd *cobra.Command, args []string) {
 	}
 	defer l4g.Close()
 
-	jobs.Srv.Store = store.NewLayeredStore(sqlstore.NewSqlSupplier(a.Metrics), a.Metrics, a.Cluster)
-	defer jobs.Srv.Store.Close()
+	a.Jobs.Store = store.NewLayeredStore(sqlstore.NewSqlSupplier(a.Metrics), a.Metrics, a.Cluster)
+	defer a.Jobs.Store.Close()
 
-	jobs.Srv.LoadLicense()
+	a.Jobs.LoadLicense()
 
 	// Run jobs
 	l4g.Info("Starting Mattermost job server")
 	if !noJobs {
-		jobs.Srv.StartWorkers()
+		a.Jobs.StartWorkers()
 	}
 	if !noSchedule {
-		jobs.Srv.StartSchedulers()
+		a.Jobs.StartSchedulers()
 	}
 
 	var signalChan chan os.Signal = make(chan os.Signal)
@@ -58,8 +57,8 @@ func jobserverCmdF(cmd *cobra.Command, args []string) {
 	// Cleanup anything that isn't handled by a defer statement
 	l4g.Info("Stopping Mattermost job server")
 
-	jobs.Srv.StopSchedulers()
-	jobs.Srv.StopWorkers()
+	a.Jobs.StopSchedulers()
+	a.Jobs.StopWorkers()
 
 	l4g.Info("Stopped Mattermost job server")
 }

cmd/platform/server.go

@@ -13,7 +13,6 @@ import (
 	"github.com/mattermost/mattermost-server/api"
 	"github.com/mattermost/mattermost-server/api4"
 	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/mattermost-server/jobs"
 	"github.com/mattermost/mattermost-server/manualtesting"
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/mattermost/mattermost-server/utils"
@@ -138,12 +137,12 @@ func runServer(configFileLocation string) {
 		}
 	}
 
-	jobs.Srv.Store = a.Srv.Store
+	a.Jobs.Store = a.Srv.Store
 	if *utils.Cfg.JobSettings.RunJobs {
-		jobs.Srv.StartWorkers()
+		a.Jobs.StartWorkers()
 	}
 	if *utils.Cfg.JobSettings.RunScheduler {
-		jobs.Srv.StartSchedulers()
+		a.Jobs.StartSchedulers()
 	}
 
 	// wait for kill signal before attempting to gracefully shutdown
@@ -160,8 +159,8 @@ func runServer(configFileLocation string) {
 		a.Metrics.StopServer()
 	}
 
-	jobs.Srv.StopSchedulers()
-	jobs.Srv.StopWorkers()
+	a.Jobs.StopSchedulers()
+	a.Jobs.StopWorkers()
 
 	a.StopServer()
 }