IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-12849 Moving all non request scoped items to Server struct (#9806)

Browse Source 
* Moving goroutine pool

* Auto refactor

* Moving plugins.

* Auto refactor

* Moving fields to server

* Auto refactor

* Removing siteurl duplication.

* Moving reset of app fields

* Auto refactor

* Formatting

* Moving niling of Server to after last use

* Fixing unit tests.
This commit is contained in:
Christopher Speller
2018-11-07 10:20:07 -08:00
committed by GitHub
parent 0dcbecac87
commit ecade2f1ec
52 changed files with 388 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/mattermost/commands/jobserver.go
View File

@@ -44,12 +44,12 @@ func jobserverCmdF(command *cobra.Command, args []string) {
defer mlog.Info("Stopped Mattermost job server")
if !noJobs {
a.Jobs.StartWorkers()
defer a.Jobs.StopWorkers()
a.Srv.Jobs.StartWorkers()
defer a.Srv.Jobs.StopWorkers()
}
if !noSchedule {
a.Jobs.StartSchedulers()
defer a.Jobs.StopSchedulers()
a.Srv.Jobs.StartSchedulers()
defer a.Srv.Jobs.StopSchedulers()
}
signalChan := make(chan os.Signal, 1)

18
cmd/mattermost/commands/server.go
View File

@@ -147,19 +147,19 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform
manualtesting.Init(api)
}
a.Go(func() {
a.Srv.Go(func() {
runSecurityJob(a)
})
a.Go(func() {
a.Srv.Go(func() {
runDiagnosticsJob(a)
})
a.Go(func() {
a.Srv.Go(func() {
runSessionCleanupJob(a)
})
a.Go(func() {
a.Srv.Go(func() {
runTokenCleanupJob(a)
})
a.Go(func() {
a.Srv.Go(func() {
runCommandWebhookCleanupJob(a)
})
@@ -181,12 +181,12 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform
}
if *a.Config().JobSettings.RunJobs {
a.Jobs.StartWorkers()
defer a.Jobs.StopWorkers()
a.Srv.Jobs.StartWorkers()
defer a.Srv.Jobs.StopWorkers()
}
if *a.Config().JobSettings.RunScheduler {
a.Jobs.StartSchedulers()
defer a.Jobs.StopSchedulers()
a.Srv.Jobs.StartSchedulers()
defer a.Srv.Jobs.StopSchedulers()
}
notifyReady()