Support json.RawMessage in configuration env overrides (#23610)
* support json.RawMessage in env overrides
Этот коммит содержится в:
@@ -111,13 +111,17 @@ func (s *Server) configureAudit(adt *audit.Audit, bAllowAdvancedLogging bool) er
|
||||
|
||||
var logConfigSrc config.LogConfigSrc
|
||||
dsn := s.platform.Config().ExperimentalAuditSettings.GetAdvancedLoggingConfig()
|
||||
if bAllowAdvancedLogging && !utils.IsEmptyJSON(dsn) {
|
||||
var err error
|
||||
logConfigSrc, err = config.NewLogConfigSrc(dsn, s.platform.GetConfigStore())
|
||||
if err != nil {
|
||||
return fmt.Errorf("invalid config source for audit, %w", err)
|
||||
if bAllowAdvancedLogging {
|
||||
if !utils.IsEmptyJSON(dsn) {
|
||||
var err error
|
||||
logConfigSrc, err = config.NewLogConfigSrc(dsn, s.platform.GetConfigStore())
|
||||
if err != nil {
|
||||
return fmt.Errorf("invalid config source for audit, %w", err)
|
||||
}
|
||||
mlog.Debug("Loaded audit configuration", mlog.String("source", string(dsn)))
|
||||
} else {
|
||||
s.Log().Debug("Advanced logging config not provided for audit")
|
||||
}
|
||||
mlog.Debug("Loaded audit configuration", mlog.String("source", string(dsn)))
|
||||
}
|
||||
|
||||
// ExperimentalAuditSettings provides basic file audit (E0, E10); logConfigSrc provides advanced config (E20).
|
||||
|
||||
@@ -129,6 +129,8 @@ func (ps *PlatformService) ConfigureLogger(name string, logger *mlog.Logger, log
|
||||
return fmt.Errorf("invalid config source for %s, %w", name, err)
|
||||
}
|
||||
ps.logger.Info("Loaded configuration for "+name, mlog.String("source", string(dsn)))
|
||||
} else {
|
||||
ps.logger.Debug("Advanced logging config not provided for " + name)
|
||||
}
|
||||
|
||||
cfg, err := config.MloggerConfigFromLoggerConfig(logSettings, logConfigSrc, getPath)
|
||||
|
||||
Ссылка в новой задаче
Block a user