diff --git a/build/handlers.go b/build/handlers.go index 9ffbdd70a6..00c4e0ace0 100644 --- a/build/handlers.go +++ b/build/handlers.go @@ -9,8 +9,10 @@ import ( // 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) { +func NewDefaultLogHandlers(cfg *LogConfig, + rotator *RotatingLogWriter) []btclog.Handler { + + var handlers []btclog.Handler consoleLogHandler := btclog.NewDefaultHandler( os.Stdout, cfg.Console.HandlerOptions()..., @@ -19,5 +21,18 @@ func NewDefaultLogHandlers(cfg *LogConfig, rotator *RotatingLogWriter) ( rotator, cfg.File.HandlerOptions()..., ) - return consoleLogHandler, logFileHandler + maybeAddLogger := func(cmdOptionDisable bool, handler btclog.Handler) { + if !cmdOptionDisable { + handlers = append(handlers, handler) + } + } + switch LoggingType { + case LogTypeStdOut: + maybeAddLogger(cfg.Console.Disable, consoleLogHandler) + case LogTypeDefault: + maybeAddLogger(cfg.Console.Disable, consoleLogHandler) + maybeAddLogger(cfg.File.Disable, logFileHandler) + } + + return handlers } diff --git a/config.go b/config.go index a427e4c7d4..c8991cf60d 100644 --- a/config.go +++ b/config.go @@ -21,7 +21,6 @@ import ( "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btclog/v2" flags "github.com/jessevdk/go-flags" "github.com/lightninglabs/neutrino" "github.com/lightningnetwork/lnd/autopilot" @@ -1404,32 +1403,14 @@ func ValidateConfig(cfg Config, interceptor signal.Interceptor, fileParser, lncfg.NormalizeNetwork(cfg.ActiveNetParams.Name), ) - var ( - logCfg = cfg.LogConfig - logHandlers []btclog.Handler - consoleLogHandler, logFileHandler = build.NewDefaultLogHandlers( - logCfg, cfg.LogRotator, - ) - ) - maybeAddLogger := func(cmdOptionDisable bool, handler btclog.Handler) { - if !cmdOptionDisable { - logHandlers = append(logHandlers, handler) - } - } - switch build.LoggingType { - case build.LogTypeStdOut: - maybeAddLogger(logCfg.Console.Disable, consoleLogHandler) - case build.LogTypeDefault: - maybeAddLogger(logCfg.Console.Disable, consoleLogHandler) - maybeAddLogger(logCfg.File.Disable, logFileHandler) - } - if !build.SuportedLogCompressor(cfg.LogCompressor) { return nil, mkErr("invalid log compressor: %v", cfg.LogCompressor) } - cfg.SubLogMgr = build.NewSubLoggerManager(logHandlers...) + cfg.SubLogMgr = build.NewSubLoggerManager(build.NewDefaultLogHandlers( + cfg.LogConfig, cfg.LogRotator, + )...) // Initialize logging at the default logging level. SetupLoggers(cfg.SubLogMgr, interceptor)