build+config: add default handler constructor
Since most of our projects will use the same handler duo and apply the config options the same way, let's make our lives easier and add a default handler constructor.
This commit is contained in:
2 files changed
+28
-7
No files matched your search
@@ -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
|
||||
}
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user