From edef99011c5d2b384fbf78d42ab57dca84ef36ed Mon Sep 17 00:00:00 2001 From: Kyle Havlovitz Date: Fri, 3 Feb 2023 15:12:02 -0800 Subject: [PATCH] command: Fix logger not initializing properly in envoy command (#16148) --- command/connect/envoy/envoy.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go index 354560d906..8bd27d4a86 100644 --- a/command/connect/envoy/envoy.go +++ b/command/connect/envoy/envoy.go @@ -235,12 +235,6 @@ func (c *cmd) init() { c.dialFunc = func(network string, address string) (net.Conn, error) { return net.DialTimeout(network, address, 3*time.Second) } - - opts := hclog.LoggerOptions{Level: hclog.Off} - if c.enableLogging { - opts.Level = hclog.Debug - } - c.logger = hclog.New(&opts) } // canBindInternal is here mainly so we can unit test this with a constant net.Addr list @@ -293,13 +287,18 @@ func (c *cmd) Run(args []string) int { c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err)) return 1 } - c.logger.Debug("Initialized API client") // TODO: refactor return c.run(c.flags.Args()) } func (c *cmd) run(args []string) int { + opts := hclog.LoggerOptions{Level: hclog.Off} + if c.enableLogging { + opts.Level = hclog.Debug + } + c.logger = hclog.New(&opts) + c.logger.Debug("Starting Envoy config generation") if c.nodeName != "" && c.proxyID == "" { c.UI.Error("'-node-name' requires '-proxy-id'")