diff options
author | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
commit | eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa (patch) | |
tree | ed01fd9488bd86f6c2daf0b299dff5beb43973db /cmd/commands/jobserver.go | |
parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
parent | 2e6b3da1d3466db379fef0d61a23e2878d17ee9d (diff) | |
download | chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.gz chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.bz2 chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.zip |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'cmd/commands/jobserver.go')
-rw-r--r-- | cmd/commands/jobserver.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd/commands/jobserver.go b/cmd/commands/jobserver.go index b96984b41..a7671e190 100644 --- a/cmd/commands/jobserver.go +++ b/cmd/commands/jobserver.go @@ -8,8 +8,8 @@ import ( "os/signal" "syscall" - l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/cmd" + "github.com/mattermost/mattermost-server/mlog" "github.com/spf13/cobra" ) @@ -36,13 +36,12 @@ func jobserverCmdF(command *cobra.Command, args []string) { if err != nil { panic(err.Error()) } - defer l4g.Close() defer a.Shutdown() a.LoadLicense() // Run jobs - l4g.Info("Starting Mattermost job server") + mlog.Info("Starting Mattermost job server") if !noJobs { a.Jobs.StartWorkers() } @@ -55,10 +54,10 @@ func jobserverCmdF(command *cobra.Command, args []string) { <-signalChan // Cleanup anything that isn't handled by a defer statement - l4g.Info("Stopping Mattermost job server") + mlog.Info("Stopping Mattermost job server") a.Jobs.StopSchedulers() a.Jobs.StopWorkers() - l4g.Info("Stopped Mattermost job server") + mlog.Info("Stopped Mattermost job server") } |