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.

1 files changed, 7 insertions, 6 deletions

diff --git a/jobs/jobs_watcher.go b/jobs/jobs_watcher.go
index 645715db4..07979442d 100644
--- a/jobs/jobs_watcher.go
+++ b/jobs/jobs_watcher.go
@@ -4,10 +4,11 @@
 package jobs
 
 import (
+	"fmt"
 	"math/rand"
 	"time"
 
-	l4g "github.com/alecthomas/log4go"
+	"github.com/mattermost/mattermost-server/mlog"
 	"github.com/mattermost/mattermost-server/model"
 )
 
@@ -35,7 +36,7 @@ func (srv *JobServer) MakeWatcher(workers *Workers, pollingInterval int) *Watche
 }
 
 func (watcher *Watcher) Start() {
-	l4g.Debug("Watcher Started")
+	mlog.Debug("Watcher Started")
 
 	// Delay for some random number of milliseconds before starting to ensure that multiple
 	// instances of the jobserver  don't poll at a time too close to each other.
@@ -43,14 +44,14 @@ func (watcher *Watcher) Start() {
 	<-time.After(time.Duration(rand.Intn(watcher.pollingInterval)) * time.Millisecond)
 
 	defer func() {
-		l4g.Debug("Watcher Finished")
+		mlog.Debug("Watcher Finished")
 		watcher.stopped <- true
 	}()
 
 	for {
 		select {
 		case <-watcher.stop:
-			l4g.Debug("Watcher: Received stop signal")
+			mlog.Debug("Watcher: Received stop signal")
 			return
 		case <-time.After(time.Duration(watcher.pollingInterval) * time.Millisecond):
 			watcher.PollAndNotify()
@@ -59,14 +60,14 @@ func (watcher *Watcher) Start() {
 }
 
 func (watcher *Watcher) Stop() {
-	l4g.Debug("Watcher Stopping")
+	mlog.Debug("Watcher Stopping")
 	watcher.stop <- true
 	<-watcher.stopped
 }
 
 func (watcher *Watcher) PollAndNotify() {
 	if result := <-watcher.srv.Store.Job().GetAllByStatus(model.JOB_STATUS_PENDING); result.Err != nil {
-		l4g.Error("Error occurred getting all pending statuses: %v", result.Err.Error())
+		mlog.Error(fmt.Sprintf("Error occurred getting all pending statuses: %v", result.Err.Error()))
 	} else {
 		jobs := result.Data.([]*model.Job)