diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-18 15:05:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 15:05:57 -0400 |
| commit | 577ed27f1bb060080d311342047e31943a02ccbb (patch) | |
| tree | ad57fa69b1daf143e914ea2480a475e5450cc236 /cmd/platform/server.go | |
| parent | 920bc0d8712a50691b1f698779f60132536eb214 (diff) | |
| download | chat-577ed27f1bb060080d311342047e31943a02ccbb.tar.gz chat-577ed27f1bb060080d311342047e31943a02ccbb.tar.bz2 chat-577ed27f1bb060080d311342047e31943a02ccbb.zip | |
PLT-6408 Framework for job server (#6404)
* Added initial job server
* Added job server to be ran as part of platform
* Added test job to the enterprise repo
* Fixed job server not loading license
* Renamed job package to jobs
* Fixed TE not being buildable
* Added JobStatus table to database
* Changed fields used by JobStatus
* Added APIs to query job status
* Added config change listener to server
* Added option to run job server from Makefile
* Added ability to enable/disable jobs from config
* Commented out placeholder for search indexing job
* Fixed govet
* Removed debug messages and fixed job api init message
Diffstat (limited to 'cmd/platform/server.go')
| -rw-r--r-- | cmd/platform/server.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go index cb1530951..9846f8de9 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -14,6 +14,7 @@ import ( "github.com/mattermost/platform/api4" "github.com/mattermost/platform/app" "github.com/mattermost/platform/einterfaces" + "github.com/mattermost/platform/jobs" "github.com/mattermost/platform/manualtesting" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" @@ -43,7 +44,7 @@ func runServerCmd(cmd *cobra.Command, args []string) error { } func runServer(configFileLocation string) { - if errstr := doLoadConfig(configFileLocation); errstr != "" { + if errstr := utils.InitAndLoadConfig(configFileLocation); errstr != "" { l4g.Exit("Unable to load mattermost configuration file: ", errstr) return } @@ -120,6 +121,8 @@ func runServer(configFileLocation string) { } } + jobs := jobs.InitJobs(app.Srv.Store).Start() + // wait for kill signal before attempting to gracefully shutdown // the running service c := make(chan os.Signal) @@ -134,6 +137,8 @@ func runServer(configFileLocation string) { einterfaces.GetMetricsInterface().StopServer() } + jobs.Stop() + app.StopServer() } |