status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Kyle Havlovitz 2023-02-03 15:12:02 -08:00 committed by GitHub
parent 92ac3c2269
commit edef99011c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
command/connect/envoy/envoy.go
View File

@ -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'")