From 686c2fbab7607d42183ae685a27ea3d7dce8c3f6 Mon Sep 17 00:00:00 2001 From: Christopher Speller 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. --- utils/file_backend_s3.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'utils/file_backend_s3.go') diff --git a/utils/file_backend_s3.go b/utils/file_backend_s3.go index 75282897f..2f644f602 100644 --- a/utils/file_backend_s3.go +++ b/utils/file_backend_s3.go @@ -11,10 +11,10 @@ import ( "path/filepath" "strings" - l4g "github.com/alecthomas/log4go" s3 "github.com/minio/minio-go" "github.com/minio/minio-go/pkg/credentials" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" ) @@ -70,14 +70,14 @@ func (b *S3FileBackend) TestConnection() *model.AppError { } if !exists { - l4g.Warn("Bucket specified does not exist. Attempting to create...") + mlog.Warn("Bucket specified does not exist. Attempting to create...") err := s3Clnt.MakeBucket(b.bucket, b.region) if err != nil { - l4g.Error("Unable to create bucket.") + mlog.Error("Unable to create bucket.") return model.NewAppError("TestFileConnection", "Unable to create bucket", nil, err.Error(), http.StatusInternalServerError) } } - l4g.Info("Connection to S3 or minio is good. Bucket exists.") + mlog.Info("Connection to S3 or minio is good. Bucket exists.") return nil } -- cgit v1.2.3-1-g7c22