diff options
author | Christopher Speller <crspeller@gmail.com> | 2018-04-27 12:49:45 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-27 12:49:45 -0700 |
commit | 686c2fbab7607d42183ae685a27ea3d7dce8c3f6 (patch) | |
tree | 53ed73cada57bc43f342ac10e2f842cddb095218 /cmd/commands/jobserver.go | |
parent | 2acbc77d78456d7ba76ceb687b18985d7d92f814 (diff) | |
download | chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.tar.gz chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.tar.bz2 chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.zip |
Structured logging (#8673)
* Implementing structured logging
* Changes to en.json to allow refactor to run.
* Fixing global logger
* Structured logger initalization.
* Add caller.
* Do some log redirection.
* Auto refactor
* Cleaning up l4g reference and removing dependancy.
* Removing junk.
* Copyright headers.
* Fixing tests
* Revert "Changes to en.json to allow refactor to run."
This reverts commit fd8249e99bcad0231e6ea65cd77c32aae9a54026.
* Fixing some auto refactor strangeness and typo.
* Making keys more human readable.
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") } |