diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-09-05 15:24:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 15:24:21 -0400 |
| commit | 09f8267751c71bdb6d8ba2757a1e4ffe62ccf5c3 (patch) | |
| tree | d540c42e07195d62c8555c05ca5e57becf5542a6 /model | |
| parent | cc289d70610ada2797c7a07dce013fd4d89bcc10 (diff) | |
| download | chat-09f8267751c71bdb6d8ba2757a1e4ffe62ccf5c3.tar.gz chat-09f8267751c71bdb6d8ba2757a1e4ffe62ccf5c3.tar.bz2 chat-09f8267751c71bdb6d8ba2757a1e4ffe62ccf5c3.zip | |
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
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index 85181edd9..311a43261 100644 --- a/model/config.go +++ b/model/config.go @@ -272,6 +272,7 @@ type FileSettings struct { AmazonS3SSL *bool AmazonS3SignV2 *bool AmazonS3SSE *bool + AmazonS3Trace *bool } type EmailSettings struct { @@ -607,6 +608,11 @@ func (o *Config) SetDefaults() { *o.FileSettings.AmazonS3SSE = false // Not Encrypted by default. } + if o.FileSettings.AmazonS3Trace == nil { + o.FileSettings.AmazonS3Trace = new(bool) + *o.FileSettings.AmazonS3Trace = false + } + if o.FileSettings.EnableFileAttachments == nil { o.FileSettings.EnableFileAttachments = new(bool) *o.FileSettings.EnableFileAttachments = true |