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 /jobs/jobs.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 'jobs/jobs.go')
| -rw-r--r-- | jobs/jobs.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jobs/jobs.go b/jobs/jobs.go index b367730b5..850491403 100644 --- a/jobs/jobs.go +++ b/jobs/jobs.go @@ -5,11 +5,12 @@ package jobs import ( "context" + "fmt" "time" "net/http" - l4g "github.com/alecthomas/log4go" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" ) @@ -125,10 +126,10 @@ func (srv *JobServer) CancellationWatcher(ctx context.Context, jobId string, can for { select { case <-ctx.Done(): - l4g.Debug("CancellationWatcher for Job: %v Aborting as job has finished.", jobId) + mlog.Debug(fmt.Sprintf("CancellationWatcher for Job: %v Aborting as job has finished.", jobId)) return case <-time.After(CANCEL_WATCHER_POLLING_INTERVAL * time.Millisecond): - l4g.Debug("CancellationWatcher for Job: %v polling.", jobId) + mlog.Debug(fmt.Sprintf("CancellationWatcher for Job: %v polling.", jobId)) if result := <-srv.Store.Job().Get(jobId); result.Err == nil { jobStatus := result.Data.(*model.Job) if jobStatus.Status == model.JOB_STATUS_CANCEL_REQUESTED { |