upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Temporarily let AdvancedLoggingConfig take precedence over AdvancedLoggingJSON (#23578)

Browse source 
* Temporarily let AdvancedLoggingConfig take precedence over AdvancedLoggingJSON
This commit is contained in:
Doug Lauder 2023-06-01 20:19:40 -04:00 committed by GitHub
parent ac3b47bcae
commit 2efb574d3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
server/public/model/config.go
View file

@ -1344,18 +1344,23 @@ func (s *LogSettings) SetDefaults() {
s.AdvancedLoggingJSON = []byte("{}")
}
}
s.AdvancedLoggingConfig = nil
// temporarily let AdvancedLoggingConfig take precedence.
if s.AdvancedLoggingConfig == nil {
s.AdvancedLoggingConfig = NewString("")
}
//s.AdvancedLoggingConfig = nil
}
// GetAdvancedLoggingConfig returns the advanced logging config as a []byte.
// AdvancedLoggingJSON takes precident over the deprecated AdvancedLoggingConfig.
func (s *LogSettings) GetAdvancedLoggingConfig() []byte {
if !utils.IsEmptyJSON(s.AdvancedLoggingJSON) {
return s.AdvancedLoggingJSON
}
// temporarily let AdvancedLoggingConfig take precedence.
if s.AdvancedLoggingConfig != nil && !utils.IsEmptyJSON([]byte(*s.AdvancedLoggingConfig)) {
return []byte(*s.AdvancedLoggingConfig)
}
if !utils.IsEmptyJSON(s.AdvancedLoggingJSON) {
return s.AdvancedLoggingJSON
}
return []byte("{}")
}
@ -1408,18 +1413,24 @@ func (s *ExperimentalAuditSettings) SetDefaults() {
s.AdvancedLoggingJSON = []byte("{}")
}
}
s.AdvancedLoggingConfig = nil
// temporarily let AdvancedLoggingConfig take precedence.
if s.AdvancedLoggingConfig == nil {
s.AdvancedLoggingConfig = NewString("")
}
//s.AdvancedLoggingConfig = nil
}
// GetAdvancedLoggingConfig returns the advanced logging config as a []byte.
// AdvancedLoggingJSON takes precident over the deprecated AdvancedLoggingConfig.
func (s *ExperimentalAuditSettings) GetAdvancedLoggingConfig() []byte {
if !utils.IsEmptyJSON(s.AdvancedLoggingJSON) {
return s.AdvancedLoggingJSON
}
// temporarily let AdvancedLoggingConfig take precedence.
if s.AdvancedLoggingConfig != nil && !utils.IsEmptyJSON([]byte(*s.AdvancedLoggingConfig)) {
return []byte(*s.AdvancedLoggingConfig)
}
if !utils.IsEmptyJSON(s.AdvancedLoggingJSON) {
return s.AdvancedLoggingJSON
}
return []byte("{}")
}
@ -1477,18 +1488,23 @@ func (s *NotificationLogSettings) SetDefaults() {
s.AdvancedLoggingJSON = []byte("{}")
}
}
s.AdvancedLoggingConfig = nil
// temporarily let AdvancedLoggingConfig take precedence.
if s.AdvancedLoggingConfig == nil {
s.AdvancedLoggingConfig = NewString("")
}
//s.AdvancedLoggingConfig = nil
}
// GetAdvancedLoggingConfig returns the advanced logging config as a []byte.
// AdvancedLoggingJSON takes precident over the deprecated AdvancedLoggingConfig.
func (s *NotificationLogSettings) GetAdvancedLoggingConfig() []byte {
if !utils.IsEmptyJSON(s.AdvancedLoggingJSON) {
return s.AdvancedLoggingJSON
}
// temporarily let AdvancedLoggingConfig take precedence.
if s.AdvancedLoggingConfig != nil && !utils.IsEmptyJSON([]byte(*s.AdvancedLoggingConfig)) {
return []byte(*s.AdvancedLoggingConfig)
}
if !utils.IsEmptyJSON(s.AdvancedLoggingJSON) {
return s.AdvancedLoggingJSON
}
return []byte("{}")
}