mirror of
https://github.com/lightningnetwork/lnd.git
synced 2025-12-07 19:32:02 +01:00
build: switch to slog Handlers
Start using the new slog handlers. With this commit we also remove the need for the LogWriter since we let our LogRotator implement io.Writer and pass that in to our log file handler.
This commit is contained in:
Elle Mouton
121
log.go
121
log.go
@@ -3,7 +3,8 @@ package lnd
|
||||
import (
|
||||
"github.com/btcsuite/btcd/connmgr"
|
||||
"github.com/btcsuite/btcd/rpcclient"
|
||||
"github.com/btcsuite/btclog"
|
||||
btclogv1 "github.com/btcsuite/btclog"
|
||||
"github.com/btcsuite/btclog/v2"
|
||||
"github.com/lightninglabs/neutrino"
|
||||
sphinx "github.com/lightningnetwork/lightning-onion"
|
||||
"github.com/lightningnetwork/lnd/autopilot"
|
||||
@@ -116,6 +117,8 @@ func genSubLogger(root *build.SubLoggerManager,
|
||||
}
|
||||
|
||||
// SetupLoggers initializes all package-global logger variables.
|
||||
//
|
||||
//nolint:lll
|
||||
func SetupLoggers(root *build.SubLoggerManager, interceptor signal.Interceptor) {
|
||||
genLogger := genSubLogger(root, interceptor)
|
||||
|
||||
@@ -123,7 +126,7 @@ func SetupLoggers(root *build.SubLoggerManager, interceptor signal.Interceptor)
|
||||
// placeholder lnd package loggers.
|
||||
for _, l := range lndPkgLoggers {
|
||||
l.Logger = build.NewSubLogger(l.subsystem, genLogger)
|
||||
SetSubLogger(root, l.subsystem, l.Logger)
|
||||
SetV1SubLogger(root, l.subsystem, l.Logger)
|
||||
}
|
||||
|
||||
// Initialize loggers from packages outside of `lnd` first. The
|
||||
@@ -132,69 +135,69 @@ func SetupLoggers(root *build.SubLoggerManager, interceptor signal.Interceptor)
|
||||
// `btcwallet.chain`, which is overwritten by `lnwallet`. To ensure the
|
||||
// overwriting works, we need to initialize the loggers here so they
|
||||
// can be overwritten later.
|
||||
AddSubLogger(root, "BTCN", interceptor, neutrino.UseLogger)
|
||||
AddSubLogger(root, "CMGR", interceptor, connmgr.UseLogger)
|
||||
AddSubLogger(root, "RPCC", interceptor, rpcclient.UseLogger)
|
||||
AddV1SubLogger(root, "BTCN", interceptor, neutrino.UseLogger)
|
||||
AddV1SubLogger(root, "CMGR", interceptor, connmgr.UseLogger)
|
||||
AddV1SubLogger(root, "RPCC", interceptor, rpcclient.UseLogger)
|
||||
|
||||
// Some of the loggers declared in the main lnd package are also used
|
||||
// in sub packages.
|
||||
signal.UseLogger(ltndLog)
|
||||
autopilot.UseLogger(atplLog)
|
||||
|
||||
AddSubLogger(root, "LNWL", interceptor, lnwallet.UseLogger)
|
||||
AddSubLogger(root, "DISC", interceptor, discovery.UseLogger)
|
||||
AddSubLogger(root, "NTFN", interceptor, chainntnfs.UseLogger)
|
||||
AddSubLogger(root, "CHDB", interceptor, channeldb.UseLogger)
|
||||
AddSubLogger(root, "HSWC", interceptor, htlcswitch.UseLogger)
|
||||
AddSubLogger(root, "CNCT", interceptor, contractcourt.UseLogger)
|
||||
AddSubLogger(root, "UTXN", interceptor, contractcourt.UseNurseryLogger)
|
||||
AddSubLogger(root, "BRAR", interceptor, contractcourt.UseBreachLogger)
|
||||
AddSubLogger(root, "SPHX", interceptor, sphinx.UseLogger)
|
||||
AddSubLogger(root, "SWPR", interceptor, sweep.UseLogger)
|
||||
AddSubLogger(root, "SGNR", interceptor, signrpc.UseLogger)
|
||||
AddSubLogger(root, "WLKT", interceptor, walletrpc.UseLogger)
|
||||
AddSubLogger(root, "ARPC", interceptor, autopilotrpc.UseLogger)
|
||||
AddSubLogger(root, "NRPC", interceptor, neutrinorpc.UseLogger)
|
||||
AddSubLogger(root, "DRPC", interceptor, devrpc.UseLogger)
|
||||
AddSubLogger(root, "INVC", interceptor, invoices.UseLogger)
|
||||
AddSubLogger(root, "NANN", interceptor, netann.UseLogger)
|
||||
AddSubLogger(root, "WTWR", interceptor, watchtower.UseLogger)
|
||||
AddSubLogger(root, "NTFR", interceptor, chainrpc.UseLogger)
|
||||
AddSubLogger(root, "IRPC", interceptor, invoicesrpc.UseLogger)
|
||||
AddSubLogger(root, "CHNF", interceptor, channelnotifier.UseLogger)
|
||||
AddSubLogger(root, "CHBU", interceptor, chanbackup.UseLogger)
|
||||
AddSubLogger(root, "PROM", interceptor, monitoring.UseLogger)
|
||||
AddSubLogger(root, "WTCL", interceptor, wtclient.UseLogger)
|
||||
AddSubLogger(root, "PRNF", interceptor, peernotifier.UseLogger)
|
||||
AddSubLogger(root, "CHFD", interceptor, chanfunding.UseLogger)
|
||||
AddSubLogger(root, "PEER", interceptor, peer.UseLogger)
|
||||
AddSubLogger(root, "CHCL", interceptor, chancloser.UseLogger)
|
||||
AddV1SubLogger(root, "LNWL", interceptor, lnwallet.UseLogger)
|
||||
AddV1SubLogger(root, "DISC", interceptor, discovery.UseLogger)
|
||||
AddV1SubLogger(root, "NTFN", interceptor, chainntnfs.UseLogger)
|
||||
AddV1SubLogger(root, "CHDB", interceptor, channeldb.UseLogger)
|
||||
AddV1SubLogger(root, "HSWC", interceptor, htlcswitch.UseLogger)
|
||||
AddV1SubLogger(root, "CNCT", interceptor, contractcourt.UseLogger)
|
||||
AddV1SubLogger(root, "UTXN", interceptor, contractcourt.UseNurseryLogger)
|
||||
AddV1SubLogger(root, "BRAR", interceptor, contractcourt.UseBreachLogger)
|
||||
AddV1SubLogger(root, "SPHX", interceptor, sphinx.UseLogger)
|
||||
AddV1SubLogger(root, "SWPR", interceptor, sweep.UseLogger)
|
||||
AddV1SubLogger(root, "SGNR", interceptor, signrpc.UseLogger)
|
||||
AddV1SubLogger(root, "WLKT", interceptor, walletrpc.UseLogger)
|
||||
AddV1SubLogger(root, "ARPC", interceptor, autopilotrpc.UseLogger)
|
||||
AddV1SubLogger(root, "NRPC", interceptor, neutrinorpc.UseLogger)
|
||||
AddV1SubLogger(root, "DRPC", interceptor, devrpc.UseLogger)
|
||||
AddV1SubLogger(root, "INVC", interceptor, invoices.UseLogger)
|
||||
AddV1SubLogger(root, "NANN", interceptor, netann.UseLogger)
|
||||
AddV1SubLogger(root, "WTWR", interceptor, watchtower.UseLogger)
|
||||
AddV1SubLogger(root, "NTFR", interceptor, chainrpc.UseLogger)
|
||||
AddV1SubLogger(root, "IRPC", interceptor, invoicesrpc.UseLogger)
|
||||
AddV1SubLogger(root, "CHNF", interceptor, channelnotifier.UseLogger)
|
||||
AddV1SubLogger(root, "CHBU", interceptor, chanbackup.UseLogger)
|
||||
AddV1SubLogger(root, "PROM", interceptor, monitoring.UseLogger)
|
||||
AddV1SubLogger(root, "WTCL", interceptor, wtclient.UseLogger)
|
||||
AddV1SubLogger(root, "PRNF", interceptor, peernotifier.UseLogger)
|
||||
AddV1SubLogger(root, "CHFD", interceptor, chanfunding.UseLogger)
|
||||
AddV1SubLogger(root, "PEER", interceptor, peer.UseLogger)
|
||||
AddV1SubLogger(root, "CHCL", interceptor, chancloser.UseLogger)
|
||||
|
||||
AddSubLogger(root, routing.Subsystem, interceptor, routing.UseLogger)
|
||||
AddSubLogger(root, routerrpc.Subsystem, interceptor, routerrpc.UseLogger)
|
||||
AddSubLogger(root, chanfitness.Subsystem, interceptor, chanfitness.UseLogger)
|
||||
AddSubLogger(root, verrpc.Subsystem, interceptor, verrpc.UseLogger)
|
||||
AddSubLogger(root, healthcheck.Subsystem, interceptor, healthcheck.UseLogger)
|
||||
AddSubLogger(root, chainreg.Subsystem, interceptor, chainreg.UseLogger)
|
||||
AddSubLogger(root, chanacceptor.Subsystem, interceptor, chanacceptor.UseLogger)
|
||||
AddSubLogger(root, funding.Subsystem, interceptor, funding.UseLogger)
|
||||
AddSubLogger(root, cluster.Subsystem, interceptor, cluster.UseLogger)
|
||||
AddSubLogger(root, rpcperms.Subsystem, interceptor, rpcperms.UseLogger)
|
||||
AddSubLogger(root, tor.Subsystem, interceptor, tor.UseLogger)
|
||||
AddSubLogger(root, btcwallet.Subsystem, interceptor, btcwallet.UseLogger)
|
||||
AddSubLogger(root, rpcwallet.Subsystem, interceptor, rpcwallet.UseLogger)
|
||||
AddSubLogger(root, peersrpc.Subsystem, interceptor, peersrpc.UseLogger)
|
||||
AddSubLogger(root, graph.Subsystem, interceptor, graph.UseLogger)
|
||||
AddSubLogger(root, lncfg.Subsystem, interceptor, lncfg.UseLogger)
|
||||
AddSubLogger(
|
||||
AddV1SubLogger(root, routing.Subsystem, interceptor, routing.UseLogger)
|
||||
AddV1SubLogger(root, routerrpc.Subsystem, interceptor, routerrpc.UseLogger)
|
||||
AddV1SubLogger(root, chanfitness.Subsystem, interceptor, chanfitness.UseLogger)
|
||||
AddV1SubLogger(root, verrpc.Subsystem, interceptor, verrpc.UseLogger)
|
||||
AddV1SubLogger(root, healthcheck.Subsystem, interceptor, healthcheck.UseLogger)
|
||||
AddV1SubLogger(root, chainreg.Subsystem, interceptor, chainreg.UseLogger)
|
||||
AddV1SubLogger(root, chanacceptor.Subsystem, interceptor, chanacceptor.UseLogger)
|
||||
AddV1SubLogger(root, funding.Subsystem, interceptor, funding.UseLogger)
|
||||
AddV1SubLogger(root, cluster.Subsystem, interceptor, cluster.UseLogger)
|
||||
AddV1SubLogger(root, rpcperms.Subsystem, interceptor, rpcperms.UseLogger)
|
||||
AddV1SubLogger(root, tor.Subsystem, interceptor, tor.UseLogger)
|
||||
AddV1SubLogger(root, btcwallet.Subsystem, interceptor, btcwallet.UseLogger)
|
||||
AddV1SubLogger(root, rpcwallet.Subsystem, interceptor, rpcwallet.UseLogger)
|
||||
AddV1SubLogger(root, peersrpc.Subsystem, interceptor, peersrpc.UseLogger)
|
||||
AddV1SubLogger(root, graph.Subsystem, interceptor, graph.UseLogger)
|
||||
AddV1SubLogger(root, lncfg.Subsystem, interceptor, lncfg.UseLogger)
|
||||
AddV1SubLogger(
|
||||
root, blindedpath.Subsystem, interceptor, blindedpath.UseLogger,
|
||||
)
|
||||
}
|
||||
|
||||
// AddSubLogger is a helper method to conveniently create and register the
|
||||
// AddV1SubLogger is a helper method to conveniently create and register the
|
||||
// logger of one or more sub systems.
|
||||
func AddSubLogger(root *build.SubLoggerManager, subsystem string,
|
||||
interceptor signal.Interceptor, useLoggers ...func(btclog.Logger)) {
|
||||
func AddV1SubLogger(root *build.SubLoggerManager, subsystem string,
|
||||
interceptor signal.Interceptor, useLoggers ...func(btclogv1.Logger)) {
|
||||
|
||||
// genSubLogger will return a callback for creating a logger instance,
|
||||
// which we will give to the root logger.
|
||||
@@ -203,13 +206,15 @@ func AddSubLogger(root *build.SubLoggerManager, subsystem string,
|
||||
// Create and register just a single logger to prevent them from
|
||||
// overwriting each other internally.
|
||||
logger := build.NewSubLogger(subsystem, genLogger)
|
||||
SetSubLogger(root, subsystem, logger, useLoggers...)
|
||||
SetV1SubLogger(root, subsystem, logger, useLoggers...)
|
||||
}
|
||||
|
||||
// SetSubLogger is a helper method to conveniently register the logger of a sub
|
||||
// system.
|
||||
func SetSubLogger(root *build.SubLoggerManager, subsystem string,
|
||||
logger btclog.Logger, useLoggers ...func(btclog.Logger)) {
|
||||
// SetV1SubLogger is a helper method to conveniently register the logger of a
|
||||
// sub system. Note that the btclog v2 logger implements the btclog v1 logger
|
||||
// which is why we can pass the v2 logger to the UseLogger call-backs that
|
||||
// expect the v1 logger.
|
||||
func SetV1SubLogger(root *build.SubLoggerManager, subsystem string,
|
||||
logger btclog.Logger, useLoggers ...func(btclogv1.Logger)) {
|
||||
|
||||
root.RegisterSubLogger(subsystem, logger)
|
||||
for _, useLogger := range useLoggers {
|
||||
|
||||
Reference in New Issue
Block a user