diff options
Diffstat (limited to 'cmd/platform')
-rw-r--r-- | cmd/platform/jobserver.go | 62 | ||||
-rw-r--r-- | cmd/platform/mattermost.go | 2 | ||||
-rw-r--r-- | cmd/platform/server.go | 8 |
3 files changed, 69 insertions, 3 deletions
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 |