From 686c2fbab7607d42183ae685a27ea3d7dce8c3f6 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Fri, 27 Apr 2018 12:49:45 -0700
Subject: 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.
---
 store/sqlstore/session_store.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'store/sqlstore/session_store.go')

diff --git a/store/sqlstore/session_store.go b/store/sqlstore/session_store.go
index 221603865..c63abefbb 100644
--- a/store/sqlstore/session_store.go
+++ b/store/sqlstore/session_store.go
@@ -4,10 +4,11 @@
 package sqlstore
 
 import (
+	"fmt"
 	"net/http"
 	"time"
 
-	l4g "github.com/alecthomas/log4go"
+	"github.com/mattermost/mattermost-server/mlog"
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/mattermost/mattermost-server/store"
 )
@@ -223,7 +224,7 @@ func (me SqlSessionStore) AnalyticsSessionCount() store.StoreChannel {
 }
 
 func (me SqlSessionStore) Cleanup(expiryTime int64, batchSize int64) {
-	l4g.Debug("Cleaning up session store.")
+	mlog.Debug("Cleaning up session store.")
 
 	var query string
 	if me.DriverName() == model.DATABASE_DRIVER_POSTGRES {
@@ -236,13 +237,13 @@ func (me SqlSessionStore) Cleanup(expiryTime int64, batchSize int64) {
 
 	for rowsAffected > 0 {
 		if sqlResult, err := me.GetMaster().Exec(query, map[string]interface{}{"ExpiresAt": expiryTime, "Limit": batchSize}); err != nil {
-			l4g.Error("Unable to cleanup session store. err=%v", err.Error())
+			mlog.Error(fmt.Sprintf("Unable to cleanup session store. err=%v", err.Error()))
 			return
 		} else {
 			var rowErr error
 			rowsAffected, rowErr = sqlResult.RowsAffected()
 			if rowErr != nil {
-				l4g.Error("Unable to cleanup session store. err=%v", err.Error())
+				mlog.Error(fmt.Sprintf("Unable to cleanup session store. err=%v", err.Error()))
 				return
 			}
 		}
-- 
cgit v1.2.3-1-g7c22