summaryrefslogtreecommitdiffstats
path: root/cmd/mattermost/commands/server.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/mattermost/commands/server.go')
-rw-r--r--cmd/mattermost/commands/server.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go
index 1c33505f5..0b7ef009c 100644
--- a/cmd/mattermost/commands/server.go
+++ b/cmd/mattermost/commands/server.go
@@ -181,9 +181,11 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform
if *a.Config().JobSettings.RunJobs {
a.Jobs.StartWorkers()
+ defer a.Jobs.StopWorkers()
}
if *a.Config().JobSettings.RunScheduler {
a.Jobs.StartSchedulers()
+ defer a.Jobs.StopSchedulers()
}
notifyReady()
@@ -201,9 +203,6 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform
a.Metrics.StopServer()
}
- a.Jobs.StopSchedulers()
- a.Jobs.StopWorkers()
-
return nil
}