From f6e349254b04bb51fbdcfa25662b4f659473c546 Mon Sep 17 00:00:00 2001 From: Jonathan Harvey-Buschel Date: Fri, 16 Aug 2024 14:01:20 -0400 Subject: [PATCH] log: bump logrotate dep, switch to zstd compressor --- config.go | 3 ++- go.mod | 3 ++- go.sum | 5 ++++- log.go | 23 +++++++++++++++++++++-- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/config.go b/config.go index 70372e55c9..68429ea9c7 100644 --- a/config.go +++ b/config.go @@ -675,7 +675,8 @@ func loadConfig() (*config, []string, error) { // Initialize log rotation. After log rotation has been initialized, the // logger variables may be used. - initLogRotator(filepath.Join(cfg.LogDir, defaultLogFilename)) + logFile := filepath.Join(cfg.LogDir, defaultLogFilename) + initLogRotator(logFile, cfg.LogCompressor) // Parse, validate, and set debug log level(s). if err := parseAndSetDebugLevels(cfg.DebugLevel); err != nil { diff --git a/go.mod b/go.mod index 1f445d9065..adce14eef5 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/decred/dcrd/lru v1.0.0 github.com/gorilla/websocket v1.5.0 github.com/jessevdk/go-flags v1.4.0 - github.com/jrick/logrotate v1.0.0 + github.com/jrick/logrotate v1.1.2 github.com/stretchr/testify v1.8.4 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 golang.org/x/crypto v0.22.0 @@ -25,6 +25,7 @@ require ( github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 // indirect + github.com/klauspost/compress v1.15.15 github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect golang.org/x/net v0.24.0 // indirect diff --git a/go.sum b/go.sum index bb666c89de..7afedff4a8 100644 --- a/go.sum +++ b/go.sum @@ -59,10 +59,13 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= +github.com/jrick/logrotate v1.1.2 h1:6ePk462NCX7TfKtNp5JJ7MbA2YIslkpfgP03TlTYMN0= +github.com/jrick/logrotate v1.1.2/go.mod h1:f9tdWggSVK3iqavGpyvegq5IhNois7KXmasU6/N96OQ= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 h1:FOOIBWrEkLgmlgGfMuZT83xIwfPDxEI2OHu6xUmJMFE= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= +github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw= +github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= diff --git a/log.go b/log.go index d333b74ca9..54c72acb2c 100644 --- a/log.go +++ b/log.go @@ -6,6 +6,7 @@ package main import ( + "compress/gzip" "fmt" "os" "path/filepath" @@ -24,6 +25,7 @@ import ( "github.com/btcsuite/btclog" "github.com/jrick/logrotate/rotator" + "github.com/klauspost/compress/zstd" ) // logWriter implements an io.Writer that outputs to both standard output and @@ -114,8 +116,8 @@ var logCompressors = map[string]string{ // initLogRotator initializes the logging rotater to write logs to logFile and // create roll files in the same directory. It must be called before the -// package-global log rotater variables are used. -func initLogRotator(logFile string) { +// package-global log rotator variables are used. +func initLogRotator(logFile, logCompressor string) { logDir, _ := filepath.Split(logFile) err := os.MkdirAll(logDir, 0700) if err != nil { @@ -128,6 +130,23 @@ func initLogRotator(logFile string) { os.Exit(1) } + // The selected compressor was validated by the caller, so we don't need + // to handle an unknown compressor here. + var c rotator.Compressor + switch logCompressor { + case "gzip": + c = gzip.NewWriter(nil) + + case "zstd": + c, err = zstd.NewWriter(nil) + if err != nil { + fmt.Fprintf(os.Stderr, "failed to create zstd compressor: %v\n", err) + os.Exit(1) + } + } + + r.SetCompressor(c, logCompressors[logCompressor]) + logRotator = r }