[MM-64347] Enable System Console UI for AuditSettings by default (#31118)
Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
f980a538c5
Коммит
b69412d23f
@@ -1568,6 +1568,47 @@ type ExperimentalAuditSettings struct {
|
||||
Certificate *string `access:"experimental_features"` // telemetry: none
|
||||
}
|
||||
|
||||
func (s *ExperimentalAuditSettings) isValid() *AppError {
|
||||
if *s.FileEnabled {
|
||||
if *s.FileName == "" {
|
||||
return NewAppError("ExperimentalAuditSettings.isValid", "model.config.is_valid.experimental_audit_settings.file_name_empty", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if strings.HasSuffix(*s.FileName, `\`) {
|
||||
return NewAppError("ExperimentalAuditSettings.isValid", "model.config.is_valid.experimental_audit_settings.file_name_is_directory", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if *s.FileMaxSizeMB <= 0 {
|
||||
return NewAppError("ExperimentalAuditSettings.isValid", "model.config.is_valid.experimental_audit_settings.file_max_size_invalid", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if *s.FileMaxAgeDays < 0 {
|
||||
return NewAppError("ExperimentalAuditSettings.isValid", "model.config.is_valid.experimental_audit_settings.file_max_age_invalid", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if *s.FileMaxBackups < 0 {
|
||||
return NewAppError("ExperimentalAuditSettings.isValid", "model.config.is_valid.experimental_audit_settings.file_max_backups_invalid", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if *s.FileMaxQueueSize <= 0 {
|
||||
return NewAppError("ExperimentalAuditSettings.isValid", "model.config.is_valid.experimental_audit_settings.file_max_queue_size_invalid", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
}
|
||||
|
||||
cfg := make(mlog.LoggerConfiguration)
|
||||
err := json.Unmarshal(s.AdvancedLoggingJSON, &cfg)
|
||||
if err != nil {
|
||||
return NewAppError("ExperimentalAuditSettings.isValid", "model.config.is_valid.log.advanced_logging.json", map[string]any{"Error": err}, "", http.StatusBadRequest).Wrap(err)
|
||||
}
|
||||
|
||||
err = cfg.IsValid()
|
||||
if err != nil {
|
||||
return NewAppError("ExperimentalAuditSettings.isValid", "model.config.is_valid.log.advanced_logging.parse", map[string]any{"Error": err}, "", http.StatusBadRequest).Wrap(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *ExperimentalAuditSettings) SetDefaults() {
|
||||
if s.FileEnabled == nil {
|
||||
s.FileEnabled = NewPointer(false)
|
||||
@@ -4040,6 +4081,10 @@ func (o *Config) IsValid() *AppError {
|
||||
return appErr
|
||||
}
|
||||
|
||||
if appErr := o.ExperimentalAuditSettings.isValid(); appErr != nil {
|
||||
return appErr
|
||||
}
|
||||
|
||||
if appErr := o.LocalizationSettings.isValid(); appErr != nil {
|
||||
return appErr
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user