command: Fix logger not initializing properly in envoy command (#16148) (#16153)

Co-authored-by: Kyle Havlovitz <kylehav@gmail.com>
backport/patch-1/legally-massive-flounder
hc-github-team-consul-core 2 years ago committed by GitHub
parent 112235700d
commit faaa2c11f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -220,12 +220,6 @@ func (c *cmd) init() {
flags.Merge(c.flags, c.http.ClientFlags())
flags.Merge(c.flags, c.http.MultiTenancyFlags())
c.help = flags.Usage(help, c.flags)
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
@ -278,13 +272,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'")

Loading…
Cancel
Save