From 0331409488083a58d66fdf58eb22cbaa924237f6 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 1 Aug 2017 05:53:42 -0700 Subject: Add jobserver command to platform binary (#7067) * Add jobserver command to platform binary * Fixing jobserver config. Adding jobserver flags. * Fixing govet in makefile --- Makefile | 17 +------------ cmd/platform/jobserver.go | 62 +++++++++++++++++++++++++++++++++++++++++++++ cmd/platform/mattermost.go | 2 +- cmd/platform/server.go | 8 ++++-- jobs/jobserver/jobserver.go | 45 -------------------------------- jobs/server.go | 8 ++---- 6 files changed, 72 insertions(+), 70 deletions(-) create mode 100644 cmd/platform/jobserver.go delete mode 100644 jobs/jobserver/jobserver.go diff --git a/Makefile b/Makefile index 194ab3eeb..026a76582 100644 --- a/Makefile +++ b/Makefile @@ -365,20 +365,6 @@ build-client: cd $(BUILD_WEBAPP_DIR) && $(MAKE) build -build-job-server: build-job-server-linux build-job-server-mac build-job-server-windows - -build-job-server-linux: .prebuild prepare-enterprise - @echo Build mattermost job server for Linux amd64 - env GOOS=linux GOARCH=amd64 $(GO) build $(GOFLAGS) $(GO_LINKER_FLAGS) ./jobs/jobserver - -build-job-server-osx: .prebuild prepare-enterprise - @echo Build mattermost job server for OSX amd64 - env GOOS=darwin GOARCH=amd64 $(GO) build $(GOFLAGS) $(GO_LINKER_FLAGS) ./jobs/jobserver - -build-job-server-windows: .prebuild prepare-enterprise - @echo Build mattermost job server for Windows amd64 - env GOOS=windows GOARCH=amd64 $(GO) build $(GOFLAGS) $(GO_LINKER_FLAGS) ./jobs/jobserver - package: build build-client @ echo Packaging mattermost @@ -515,7 +501,7 @@ restart-client: | stop-client run-client run-job-server: @echo Running job server for development - $(GO) run $(GOFLAGS) $(GO_LINKER_FLAGS) ./jobs/jobserver/jobserver.go + $(GO) run $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform/*.go jobserver --disableconfigwatch & clean: stop-docker @echo Cleaning @@ -556,7 +542,6 @@ govet: $(GO) vet $(GOFLAGS) ./cmd/platform || exit 1 $(GO) vet $(GOFLAGS) ./einterfaces || exit 1 $(GO) vet $(GOFLAGS) ./jobs || exit 1 - $(GO) vet $(GOFLAGS) ./jobs/jobserver || exit 1 $(GO) vet $(GOFLAGS) ./manualtesting || exit 1 $(GO) vet $(GOFLAGS) ./model || exit 1 $(GO) vet $(GOFLAGS) ./model/gitlab || exit 1 diff --git a/cmd/platform/jobserver.go b/cmd/platform/jobserver.go new file mode 100644 index 000000000..73fca9961 --- /dev/null +++ b/cmd/platform/jobserver.go @@ -0,0 +1,62 @@ +// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. +package main + +import ( + "os" + "os/signal" + "syscall" + + l4g "github.com/alecthomas/log4go" + "github.com/mattermost/platform/jobs" + "github.com/mattermost/platform/store" + "github.com/mattermost/platform/utils" + "github.com/spf13/cobra" +) + +var jobserverCmd = &cobra.Command{ + Use: "jobserver", + Short: "Start the Mattermost job server", + Run: jobserverCmdF, +} + +func init() { + jobserverCmd.Flags().Bool("nojobs", false, "Do not run jobs on this jobserver.") + jobserverCmd.Flags().Bool("noschedule", false, "Do not schedule jobs from this jobserver.") +} + +func jobserverCmdF(cmd *cobra.Command, args []string) { + // Options + noJobs, _ := cmd.Flags().GetBool("nojobs") + noSchedule, _ := cmd.Flags().GetBool("noschedule") + + // Initialize + utils.InitAndLoadConfig("config.json") + defer l4g.Close() + + jobs.Srv.Store = store.NewLayeredStore() + defer jobs.Srv.Store.Close() + + jobs.Srv.LoadLicense() + + // Run jobs + l4g.Info("Starting Mattermost job server") + if !noJobs { + jobs.Srv.StartWorkers() + } + if !noSchedule { + jobs.Srv.StartSchedulers() + } + + var signalChan chan os.Signal = make(chan os.Signal) + signal.Notify(signalChan, os.Interrupt, syscall.SIGINT, syscall.SIGTERM) + <-signalChan + + // Cleanup anything that isn't handled by a defer statement + l4g.Info("Stopping Mattermost job server") + + jobs.Srv.StopSchedulers() + jobs.Srv.StopWorkers() + + l4g.Info("Stopped Mattermost job server") +} diff --git a/cmd/platform/mattermost.go b/cmd/platform/mattermost.go index 64e7974bf..4b564e1ab 100644 --- a/cmd/platform/mattermost.go +++ b/cmd/platform/mattermost.go @@ -41,7 +41,7 @@ func init() { resetCmd.Flags().Bool("confirm", false, "Confirm you really want to delete everything and a DB backup has been performed.") - rootCmd.AddCommand(serverCmd, versionCmd, userCmd, teamCmd, licenseCmd, importCmd, resetCmd, channelCmd, rolesCmd, testCmd, ldapCmd, configCmd) + rootCmd.AddCommand(serverCmd, versionCmd, userCmd, teamCmd, licenseCmd, importCmd, resetCmd, channelCmd, rolesCmd, testCmd, ldapCmd, configCmd, jobserverCmd) } var rootCmd = &cobra.Command{ diff --git a/cmd/platform/server.go b/cmd/platform/server.go index 3413472da..6186cbd86 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -127,8 +127,12 @@ func runServer(configFileLocation string) { } jobs.Srv.Store = app.Srv.Store - jobs.Srv.StartWorkers() - jobs.Srv.StartSchedulers() + if *utils.Cfg.JobSettings.RunJobs { + jobs.Srv.StartWorkers() + } + if *utils.Cfg.JobSettings.RunScheduler { + jobs.Srv.StartSchedulers() + } // wait for kill signal before attempting to gracefully shutdown // the running service diff --git a/jobs/jobserver/jobserver.go b/jobs/jobserver/jobserver.go deleted file mode 100644 index aabe5d3b2..000000000 --- a/jobs/jobserver/jobserver.go +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -package main - -import ( - "os" - "os/signal" - "syscall" - - l4g "github.com/alecthomas/log4go" - "github.com/mattermost/platform/jobs" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" - - _ "github.com/mattermost/platform/imports" -) - -func main() { - // Initialize - utils.InitAndLoadConfig("config.json") - defer l4g.Close() - - jobs.Srv.Store = store.NewLayeredStore() - defer jobs.Srv.Store.Close() - - jobs.Srv.LoadLicense() - - // Run jobs - l4g.Info("Starting Mattermost job server") - jobs.Srv.StartWorkers() - jobs.Srv.StartSchedulers() - - var signalChan chan os.Signal = make(chan os.Signal) - signal.Notify(signalChan, os.Interrupt, syscall.SIGINT, syscall.SIGTERM) - <-signalChan - - // Cleanup anything that isn't handled by a defer statement - l4g.Info("Stopping Mattermost job server") - - jobs.Srv.StopSchedulers() - jobs.Srv.StopWorkers() - - l4g.Info("Stopped Mattermost job server") -} diff --git a/jobs/server.go b/jobs/server.go index 7920cb2d5..58412a40e 100644 --- a/jobs/server.go +++ b/jobs/server.go @@ -49,15 +49,11 @@ func (server *JobServer) LoadLicense() { } func (server *JobServer) StartWorkers() { - if *utils.Cfg.JobSettings.RunJobs { - Srv.Workers = InitWorkers().Start() - } + Srv.Workers = InitWorkers().Start() } func (server *JobServer) StartSchedulers() { - if *utils.Cfg.JobSettings.RunJobs { - Srv.Schedulers = InitSchedulers().Start() - } + Srv.Schedulers = InitSchedulers().Start() } func (server *JobServer) StopWorkers() { -- cgit v1.2.3-1-g7c22