From 4e79d2d4d037e7c33ec3e63d58110668106de222 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 29 Sep 2017 04:29:29 -0500 Subject: remove jobs.Srv and other jobs-related globals (#7535) --- cmd/platform/jobserver.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'cmd/platform/jobserver.go') diff --git a/cmd/platform/jobserver.go b/cmd/platform/jobserver.go index 6d4e828bd..4f82a21ee 100644 --- a/cmd/platform/jobserver.go +++ b/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") } -- cgit v1.2.3-1-g7c22