From 4d1b916348849434fb8a6d695892b505fa5876ee Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 11 May 2020 13:30:38 -0400 Subject: [PATCH] Remove AllLoggers (#39) This was copied from Vault code but shouldn't be necessary any more as a change in hclog a while back meant that derived loggers share the log level of the parent. --- internal/cmd/base/servers.go | 6 ------ internal/cmd/commands/controller/controller.go | 2 +- internal/cmd/commands/worker/worker.go | 2 +- internal/servers/controller/controller.go | 17 +---------------- internal/servers/worker/worker.go | 17 +---------------- 5 files changed, 4 insertions(+), 40 deletions(-) diff --git a/internal/cmd/base/servers.go b/internal/cmd/base/servers.go index 2485ae9fd7..de5afe435d 100644 --- a/internal/cmd/base/servers.go +++ b/internal/cmd/base/servers.go @@ -41,7 +41,6 @@ type Server struct { GatedWriter *gatedwriter.Writer Logger hclog.Logger CombineLogs bool - AllLoggers []hclog.Logger LogLevel hclog.Level ControllerKMS wrapping.Wrapper @@ -66,7 +65,6 @@ func NewServer() *Server { return &Server{ InfoKeys: make([]string, 0, 20), Info: make(map[string]string), - AllLoggers: make([]hclog.Logger, 0), SecureRandomReader: rand.Reader, ReloadFuncsLock: new(sync.RWMutex), ReloadFuncs: make(map[string][]reloadutil.ReloadFunc), @@ -92,12 +90,9 @@ func (b *Server) SetupLogging(flagLogLevel, flagLogFormat, configLogLevel, confi // the resulting logger's format will be standard. JSONFormat: logFormat == logging.JSONFormat, }) - // Create allLoggers which can be used to HUP the various derived loggers - b.AllLoggers = []hclog.Logger{b.Logger} // create GRPC logger namedGRPCLogFaker := b.Logger.Named("grpclogfaker") - b.AllLoggers = append(b.AllLoggers, namedGRPCLogFaker) grpclog.SetLogger(&GRPCLogFaker{ Logger: namedGRPCLogFaker, Log: os.Getenv("WATCHTOWER_GRPC_LOGGING") != "", @@ -306,7 +301,6 @@ func (b *Server) SetupKMSes(ui cli.Ui, config *configutil.SharedConfig, purposes kmsLogger := b.Logger.ResetNamed(fmt.Sprintf("kms-%s-%s", purpose, kms.Type)) - b.AllLoggers = append(b.AllLoggers, kmsLogger) wrapper, wrapperConfigError := configutil.ConfigureWrapper(kms, &b.InfoKeys, &b.Info, kmsLogger) if wrapperConfigError != nil { if !errwrap.ContainsType(wrapperConfigError, new(logical.KeyNotFoundError)) { diff --git a/internal/cmd/commands/controller/controller.go b/internal/cmd/commands/controller/controller.go index 37dd96ede1..12e1b97e49 100644 --- a/internal/cmd/commands/controller/controller.go +++ b/internal/cmd/commands/controller/controller.go @@ -411,7 +411,7 @@ func (c *Command) WaitForInterrupt() int { c.Logger.Error("unknown log level found on reload", "level", newConf.LogLevel) goto RUNRELOADFUNCS } - c.controller.SetLogLevel(level) + c.Logger.SetLevel(level) } RUNRELOADFUNCS: diff --git a/internal/cmd/commands/worker/worker.go b/internal/cmd/commands/worker/worker.go index f7bea9d35f..e5cad5089a 100644 --- a/internal/cmd/commands/worker/worker.go +++ b/internal/cmd/commands/worker/worker.go @@ -318,7 +318,7 @@ func (c *Command) WaitForInterrupt() int { c.Logger.Error("unknown log level found on reload", "level", newConf.LogLevel) goto RUNRELOADFUNCS } - c.worker.SetLogLevel(level) + c.Logger.SetLevel(level) } RUNRELOADFUNCS: diff --git a/internal/servers/controller/controller.go b/internal/servers/controller/controller.go index 4af56170d2..45b2799f7f 100644 --- a/internal/servers/controller/controller.go +++ b/internal/servers/controller/controller.go @@ -20,14 +20,7 @@ type Controller struct { func New(conf *Config) (*Controller, error) { c := &Controller{ conf: conf, - logger: conf.Logger, - } - - if c.logger == nil { - c.logger = hclog.New(&hclog.LoggerOptions{ - Level: hclog.Trace, - }) - conf.AllLoggers = append(conf.AllLoggers, c.logger) + logger: conf.Logger.Named("controller"), } if conf.SecureRandomReader == nil { @@ -50,8 +43,6 @@ func New(conf *Config) (*Controller, error) { } } - c.logger = c.logger.Named("controller") - c.baseContext, c.baseCancel = context.WithCancel(context.Background()) return c, nil @@ -70,9 +61,3 @@ func (c *Controller) Shutdown() error { } return nil } - -func (c *Controller) SetLogLevel(level hclog.Level) { - for _, logger := range c.conf.AllLoggers { - logger.SetLevel(level) - } -} diff --git a/internal/servers/worker/worker.go b/internal/servers/worker/worker.go index db66ab024c..5f5e562f27 100644 --- a/internal/servers/worker/worker.go +++ b/internal/servers/worker/worker.go @@ -20,14 +20,7 @@ type Worker struct { func New(conf *Config) (*Worker, error) { c := &Worker{ conf: conf, - logger: conf.Logger, - } - - if c.logger == nil { - c.logger = hclog.New(&hclog.LoggerOptions{ - Level: hclog.Trace, - }) - conf.AllLoggers = append(conf.AllLoggers, c.logger) + logger: conf.Logger.Named("worker"), } if conf.SecureRandomReader == nil { @@ -50,8 +43,6 @@ func New(conf *Config) (*Worker, error) { } } - c.logger = c.logger.Named("worker") - c.baseContext, c.baseCancel = context.WithCancel(context.Background()) return c, nil @@ -70,9 +61,3 @@ func (c *Worker) Shutdown() error { } return nil } - -func (c *Worker) SetLogLevel(level hclog.Level) { - for _, logger := range c.conf.AllLoggers { - logger.SetLevel(level) - } -}