akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: prevent loggers from overwriting each other.

Browse Source 
Previously only the last registered logger would receive debug level
changes.
This commit is contained in:
Joost Jager 2019-12-11 08:55:10 +01:00
parent 70c5fe3d00
commit 9f1720dea8
No known key found for this signature in database
GPG Key ID: A61B9D4C393C59C7
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
log.go
View File

@ -67,12 +67,12 @@ var (
func init() { func init() {
setSubLogger("LTND", ltndLog, signal.UseLogger) setSubLogger("LTND", ltndLog, signal.UseLogger)
setSubLogger("ATPL", atplLog, autopilot.UseLogger) setSubLogger("ATPL", atplLog, autopilot.UseLogger)
setSubLogger("PEER", peerLog, nil) setSubLogger("PEER", peerLog)
setSubLogger("RPCS", rpcsLog, nil) setSubLogger("RPCS", rpcsLog)
setSubLogger("SRVR", srvrLog, nil) setSubLogger("SRVR", srvrLog)
setSubLogger("FNDG", fndgLog, nil) setSubLogger("FNDG", fndgLog)
setSubLogger("UTXN", utxnLog, nil) setSubLogger("UTXN", utxnLog)
setSubLogger("BRAR", brarLog, nil) setSubLogger("BRAR", brarLog)
addSubLogger("LNWL", lnwallet.UseLogger) addSubLogger("LNWL", lnwallet.UseLogger)
addSubLogger("DISC", discovery.UseLogger) addSubLogger("DISC", discovery.UseLogger)
@ -99,27 +99,28 @@ func init() {
addSubLogger("PRNF", peernotifier.UseLogger) addSubLogger("PRNF", peernotifier.UseLogger)
addSubLogger("CHFD", chanfunding.UseLogger) addSubLogger("CHFD", chanfunding.UseLogger)
addSubLogger(routing.Subsystem, routing.UseLogger) addSubLogger(routing.Subsystem, routing.UseLogger, localchans.UseLogger)
addSubLogger(routing.Subsystem, localchans.UseLogger)
addSubLogger(routerrpc.Subsystem, routerrpc.UseLogger) addSubLogger(routerrpc.Subsystem, routerrpc.UseLogger)
addSubLogger(wtclientrpc.Subsystem, wtclientrpc.UseLogger) addSubLogger(wtclientrpc.Subsystem, wtclientrpc.UseLogger)
addSubLogger(chanfitness.Subsystem, chanfitness.UseLogger) addSubLogger(chanfitness.Subsystem, chanfitness.UseLogger)
} }
// addSubLogger is a helper method to conveniently create and register the // addSubLogger is a helper method to conveniently create and register the
// logger of a sub system. // logger of one or more sub systems.
func addSubLogger(subsystem string, useLogger func(btclog.Logger)) { func addSubLogger(subsystem string, useLoggers ...func(btclog.Logger)) {
// Create and register just a single logger to prevent them from
// overwriting each other internally.
logger := build.NewSubLogger(subsystem, logWriter.GenSubLogger) logger := build.NewSubLogger(subsystem, logWriter.GenSubLogger)
setSubLogger(subsystem, logger, useLogger) setSubLogger(subsystem, logger, useLoggers...)
} }
// setSubLogger is a helper method to conveniently register the logger of a sub // setSubLogger is a helper method to conveniently register the logger of a sub
// system. // system.
func setSubLogger(subsystem string, logger btclog.Logger, func setSubLogger(subsystem string, logger btclog.Logger,
useLogger func(btclog.Logger)) { useLoggers ...func(btclog.Logger)) {
logWriter.RegisterSubLogger(subsystem, logger) logWriter.RegisterSubLogger(subsystem, logger)
if useLogger != nil { for _, useLogger := range useLoggers {
useLogger(logger) useLogger(logger)
} }
} }