diff --git a/build/handlers.go b/build/handlers.go new file mode 100644 index 000000000..9ffbdd70a --- /dev/null +++ b/build/handlers.go @@ -0,0 +1,23 @@ +package build + +import ( + "os" + + "github.com/btcsuite/btclog/v2" +) + +// NewDefaultLogHandlers returns the standard console logger and rotating log +// writer handlers that we generally want to use. It also applies the various +// config options to the loggers. +func NewDefaultLogHandlers(cfg *LogConfig, rotator *RotatingLogWriter) ( + btclog.Handler, btclog.Handler) { + + consoleLogHandler := btclog.NewDefaultHandler( + os.Stdout, cfg.Console.HandlerOptions()..., + ) + logFileHandler := btclog.NewDefaultHandler( + rotator, cfg.File.HandlerOptions()..., + ) + + return consoleLogHandler, logFileHandler +} diff --git a/config.go b/config.go index d0b72216a..a427e4c7d 100644 --- a/config.go +++ b/config.go @@ -1404,15 +1404,13 @@ func ValidateConfig(cfg Config, interceptor signal.Interceptor, fileParser, lncfg.NormalizeNetwork(cfg.ActiveNetParams.Name), ) - var logCfg = cfg.LogConfig - consoleLogHandler := btclog.NewDefaultHandler( - os.Stdout, logCfg.Console.HandlerOptions()..., + var ( + logCfg = cfg.LogConfig + logHandlers []btclog.Handler + consoleLogHandler, logFileHandler = build.NewDefaultLogHandlers( + logCfg, cfg.LogRotator, + ) ) - logFileHandler := btclog.NewDefaultHandler( - cfg.LogRotator, logCfg.File.HandlerOptions()..., - ) - - var logHandlers []btclog.Handler maybeAddLogger := func(cmdOptionDisable bool, handler btclog.Handler) { if !cmdOptionDisable { logHandlers = append(logHandlers, handler)