multi: update to lnd 0.13.0-beta

We update the compile time dependency of lnd to version 0.13.0-beta to
make it easier to run aperture in the same process as other projects
which also updated.
The runtime dependency is still kept at v0.12.0-beta as we don't use any
new RPCs.
This commit is contained in:
Oliver Gugger
2021-06-29 18:52:34 +02:00
parent c819b4ac7e
commit b88feb173f
4 changed files with 101 additions and 57 deletions

53
log.go
View File

@@ -6,39 +6,50 @@ import (
"github.com/lightninglabs/aperture/lsat"
"github.com/lightninglabs/aperture/proxy"
"github.com/lightninglabs/lndclient"
"github.com/lightningnetwork/lnd"
"github.com/lightningnetwork/lnd/build"
"github.com/lightningnetwork/lnd/signal"
)
const Subsystem = "APER"
var (
logWriter = build.NewRotatingLogWriter()
log = build.NewSubLogger(Subsystem, logWriter.GenSubLogger)
log = build.NewSubLogger(Subsystem, nil)
)
func init() {
setSubLogger(Subsystem, log, nil)
addSubLogger(auth.Subsystem, auth.UseLogger)
addSubLogger(lsat.Subsystem, lsat.UseLogger)
addSubLogger(proxy.Subsystem, proxy.UseLogger)
addSubLogger("LNDC", lndclient.UseLogger)
// SetupLoggers initializes all package-global logger variables.
func SetupLoggers(root *build.RotatingLogWriter, intercept signal.Interceptor) {
genLogger := genSubLogger(root, intercept)
logWriter = root
log = build.NewSubLogger(Subsystem, genLogger)
lnd.SetSubLogger(root, Subsystem, log)
lnd.AddSubLogger(root, auth.Subsystem, intercept, auth.UseLogger)
lnd.AddSubLogger(root, lsat.Subsystem, intercept, lsat.UseLogger)
lnd.AddSubLogger(root, proxy.Subsystem, intercept, proxy.UseLogger)
lnd.AddSubLogger(root, "LNDC", intercept, lndclient.UseLogger)
}
// addSubLogger is a helper method to conveniently create and register the
// logger of a sub system.
func addSubLogger(subsystem string, useLogger func(btclog.Logger)) {
logger := build.NewSubLogger(subsystem, logWriter.GenSubLogger)
setSubLogger(subsystem, logger, useLogger)
}
// genSubLogger creates a logger for a subsystem. We provide an instance of
// a signal.Interceptor to be able to shutdown in the case of a critical error.
func genSubLogger(root *build.RotatingLogWriter,
interceptor signal.Interceptor) func(string) btclog.Logger {
// setSubLogger is a helper method to conveniently register the logger of a sub
// system.
func setSubLogger(subsystem string, logger btclog.Logger,
useLogger func(btclog.Logger)) {
// Create a shutdown function which will request shutdown from our
// interceptor if it is listening.
shutdown := func() {
if !interceptor.Listening() {
return
}
logWriter.RegisterSubLogger(subsystem, logger)
if useLogger != nil {
useLogger(logger)
interceptor.RequestShutdown()
}
// Return a function which will create a sublogger from our root
// logger without shutdown fn.
return func(tag string) btclog.Logger {
return root.GenSubLogger(tag, shutdown)
}
}