diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
commit | ff6c42309c4dd328b5841cfeef6b59ea59a4379c (patch) | |
tree | c2c3b4938588549ea69653a46d98b27f6fe37b80 /utils/file_backend_s3.go | |
parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
parent | e73f1d73143ebba9c7e80d21c45bba9b61f2611c (diff) | |
download | chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.gz chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.bz2 chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'utils/file_backend_s3.go')
-rw-r--r-- | utils/file_backend_s3.go | 8 |
1 files changed, 4 insertions, 4 deletions
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 } |