From 09f8267751c71bdb6d8ba2757a1e4ffe62ccf5c3 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 5 Sep 2017 15:24:21 -0400 Subject: PLT-7517 Added setting to enable tracing of Amazon S3 connections (#7349) * PLT-7517 Added setting to enable tracing of Amazon S3 connections * Removed unnecessary placeholders on boolean settings * Added AmazonS3Trace to diagnostics * Updated AmazonS3Trace setting name in system console * Removing extra colon --- utils/file.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/file.go b/utils/file.go index 0ba132b09..19fa335c4 100644 --- a/utils/file.go +++ b/utils/file.go @@ -33,7 +33,17 @@ func s3New(endpoint, accessKey, secretKey string, secure bool, signV2 bool, regi } else { creds = credentials.NewStatic(accessKey, secretKey, "", credentials.SignatureV4) } - return s3.NewWithCredentials(endpoint, creds, secure, region) + + s3Clnt, err := s3.NewWithCredentials(endpoint, creds, secure, region) + if err != nil { + return nil, err + } + + if *Cfg.FileSettings.AmazonS3Trace { + s3Clnt.TraceOn(os.Stdout) + } + + return s3Clnt, nil } func TestFileConnection() *model.AppError { -- cgit v1.2.3-1-g7c22