From 1dec8ab985e1023eff96fea7eeff0a021f5113ce Mon Sep 17 00:00:00 2001 From: Elle Mouton Date: Tue, 4 Mar 2025 12:51:59 +0200 Subject: [PATCH] build: add yaml tags to embedded LogConfig structs For any embedded struct, the `yaml:",inline"` tag is required. --- build/config.go | 4 ++-- build/config_dev.go | 6 +++--- build/config_prod.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/config.go b/build/config.go index 74a2375663..6c100bf188 100644 --- a/build/config.go +++ b/build/config.go @@ -57,7 +57,7 @@ func DefaultLogConfig() *LogConfig { Compressor: defaultLogCompressor, MaxLogFiles: DefaultMaxLogFiles, MaxLogFileSize: DefaultMaxLogFileSize, - LoggerConfig: LoggerConfig{ + LoggerConfig: &LoggerConfig{ CallSite: callSiteOff, }, }, @@ -92,7 +92,7 @@ func (cfg *LoggerConfig) HandlerOptions() []btclog.HandlerOption { // //nolint:ll type FileLoggerConfig struct { - LoggerConfig + *LoggerConfig `yaml:",inline"` Compressor string `long:"compressor" description:"Compression algorithm to use when rotating logs." choice:"gzip" choice:"zstd"` MaxLogFiles int `long:"max-files" description:"Maximum logfiles to keep (0 for no rotation)"` MaxLogFileSize int `long:"max-file-size" description:"Maximum logfile size in MB"` diff --git a/build/config_dev.go b/build/config_dev.go index efa8104c91..21d7820efb 100644 --- a/build/config_dev.go +++ b/build/config_dev.go @@ -24,15 +24,15 @@ const ( // //nolint:ll type consoleLoggerCfg struct { - LoggerConfig - Style bool `long:"style" description:"If set, the output will be styled with color and fonts"` + *LoggerConfig `yaml:",inline"` + Style bool `long:"style" description:"If set, the output will be styled with color and fonts"` } // defaultConsoleLoggerCfg returns the default consoleLoggerCfg for the dev // console logger. func defaultConsoleLoggerCfg() *consoleLoggerCfg { return &consoleLoggerCfg{ - LoggerConfig: LoggerConfig{ + LoggerConfig: &LoggerConfig{ CallSite: callSiteShort, }, } diff --git a/build/config_prod.go b/build/config_prod.go index 5f2ebffa48..f98f6f1652 100644 --- a/build/config_prod.go +++ b/build/config_prod.go @@ -8,14 +8,14 @@ package build // //nolint:ll type consoleLoggerCfg struct { - LoggerConfig + *LoggerConfig `yaml:",inline"` } // defaultConsoleLoggerCfg returns the default consoleLoggerCfg for the prod // console logger. func defaultConsoleLoggerCfg() *consoleLoggerCfg { return &consoleLoggerCfg{ - LoggerConfig: LoggerConfig{ + LoggerConfig: &LoggerConfig{ CallSite: callSiteOff, }, }