diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
| commit | eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa (patch) | |
| tree | ed01fd9488bd86f6c2daf0b299dff5beb43973db /model/config.go | |
| parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
| parent | 2e6b3da1d3466db379fef0d61a23e2878d17ee9d (diff) | |
| download | chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.gz chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.bz2 chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.zip | |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go index fb43dea42..5074b7637 100644 --- a/model/config.go +++ b/model/config.go @@ -585,9 +585,10 @@ func (s *SqlSettings) SetDefaults() { type LogSettings struct { EnableConsole bool ConsoleLevel string + ConsoleJson *bool EnableFile bool FileLevel string - FileFormat string + FileJson *bool FileLocation string EnableWebhookDebugging bool EnableDiagnostics *bool @@ -597,6 +598,14 @@ func (s *LogSettings) SetDefaults() { if s.EnableDiagnostics == nil { s.EnableDiagnostics = NewBool(true) } + + if s.ConsoleJson == nil { + s.ConsoleJson = NewBool(true) + } + + if s.FileJson == nil { + s.FileJson = NewBool(true) + } } type PasswordSettings struct { |