lnd+build: add logcompressor flag

This commit is contained in:
Jonathan Harvey-Buschel 2024-08-26 18:43:42 -04:00
parent 750770e190
commit f360532eb1
No known key found for this signature in database
GPG Key ID: D55307DC71F37212
3 changed files with 37 additions and 0 deletions

View File

@ -36,6 +36,32 @@ func (t LogType) String() string {
} }
} }
// Declare the supported log file compressors as exported consts for easier use
// from other projects.
const (
// Gzip is the default compressor.
Gzip = "gzip"
// Zstd is a modern compressor that compresses better than Gzip, in less
// time.
Zstd = "zstd"
)
// logCompressors maps the identifier for each supported compression algorithm
// to the extension used for the compressed log files.
var logCompressors = map[string]string{
Gzip: "gz",
Zstd: "zst",
}
// SuportedLogCompressor returns whether or not logCompressor is a supported
// compression algorithm for log files.
func SuportedLogCompressor(logCompressor string) bool {
_, ok := logCompressors[logCompressor]
return ok
}
// LogWriter is a stub type whose behavior can be changed using the build flags // LogWriter is a stub type whose behavior can be changed using the build flags
// "stdlog" and "nolog". The default behavior is to write to both stdout and the // "stdlog" and "nolog". The default behavior is to write to both stdout and the
// RotatorPipe. Passing "stdlog" will cause it only to write to stdout, and // RotatorPipe. Passing "stdlog" will cause it only to write to stdout, and

View File

@ -59,6 +59,7 @@ const (
defaultLogLevel = "info" defaultLogLevel = "info"
defaultLogDirname = "logs" defaultLogDirname = "logs"
defaultLogFilename = "lnd.log" defaultLogFilename = "lnd.log"
defaultLogCompressor = build.Gzip
defaultRPCPort = 10009 defaultRPCPort = 10009
defaultRESTPort = 8080 defaultRESTPort = 8080
defaultPeerPort = 9735 defaultPeerPort = 9735
@ -315,6 +316,7 @@ type Config struct {
ReadMacPath string `long:"readonlymacaroonpath" description:"Path to write the read-only macaroon for lnd's RPC and REST services if it doesn't exist"` ReadMacPath string `long:"readonlymacaroonpath" description:"Path to write the read-only macaroon for lnd's RPC and REST services if it doesn't exist"`
InvoiceMacPath string `long:"invoicemacaroonpath" description:"Path to the invoice-only macaroon for lnd's RPC and REST services if it doesn't exist"` InvoiceMacPath string `long:"invoicemacaroonpath" description:"Path to the invoice-only macaroon for lnd's RPC and REST services if it doesn't exist"`
LogDir string `long:"logdir" description:"Directory to log output."` LogDir string `long:"logdir" description:"Directory to log output."`
LogCompressor string `long:"logcompressor" description:"Compression algorithm to use when rotating logs." choice:"gzip" choice:"zstd"`
MaxLogFiles int `long:"maxlogfiles" description:"Maximum logfiles to keep (0 for no rotation)"` MaxLogFiles int `long:"maxlogfiles" description:"Maximum logfiles to keep (0 for no rotation)"`
MaxLogFileSize int `long:"maxlogfilesize" description:"Maximum logfile size in MB"` MaxLogFileSize int `long:"maxlogfilesize" description:"Maximum logfile size in MB"`
AcceptorTimeout time.Duration `long:"acceptortimeout" description:"Time after which an RPCAcceptor will time out and return false if it hasn't yet received a response"` AcceptorTimeout time.Duration `long:"acceptortimeout" description:"Time after which an RPCAcceptor will time out and return false if it hasn't yet received a response"`
@ -560,6 +562,7 @@ func DefaultConfig() Config {
LetsEncryptDir: defaultLetsEncryptDir, LetsEncryptDir: defaultLetsEncryptDir,
LetsEncryptListen: defaultLetsEncryptListen, LetsEncryptListen: defaultLetsEncryptListen,
LogDir: defaultLogDir, LogDir: defaultLogDir,
LogCompressor: defaultLogCompressor,
MaxLogFiles: defaultMaxLogFiles, MaxLogFiles: defaultMaxLogFiles,
MaxLogFileSize: defaultMaxLogFileSize, MaxLogFileSize: defaultMaxLogFileSize,
AcceptorTimeout: defaultAcceptorTimeout, AcceptorTimeout: defaultAcceptorTimeout,
@ -1446,6 +1449,11 @@ func ValidateConfig(cfg Config, interceptor signal.Interceptor, fileParser,
os.Exit(0) os.Exit(0)
} }
if !build.SuportedLogCompressor(cfg.LogCompressor) {
return nil, mkErr("invalid log compressor: %v",
cfg.LogCompressor)
}
// Initialize logging at the default logging level. // Initialize logging at the default logging level.
SetupLoggers(cfg.LogWriter, interceptor) SetupLoggers(cfg.LogWriter, interceptor)
err = cfg.LogWriter.InitLogRotator( err = cfg.LogWriter.InitLogRotator(

View File

@ -36,6 +36,9 @@
; Max log file size in MB before it is rotated. ; Max log file size in MB before it is rotated.
; maxlogfilesize=10 ; maxlogfilesize=10
; Compression algorithm to use when rotating logs.
; logcompressor=gzip
; Time after which an RPCAcceptor will time out and return false if ; Time after which an RPCAcceptor will time out and return false if
; it hasn't yet received a response. ; it hasn't yet received a response.
; acceptortimeout=15s ; acceptortimeout=15s