Skip to content

Commit

Permalink
update log messages and comments from code review suggestions
Browse files Browse the repository at this point in the history
Co-authored-by: Nathan Coleman <nathandanielcoleman@gmail.com>
  • Loading branch information
mikemorris and nathancoleman committed Jun 6, 2023
1 parent bfea751 commit aadfeed
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/consuldp/consul_dataplane.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ func (cdp *ConsulDataplane) Run(ctx context.Context) error {
case <-cdp.xdsServerExited():
// Initiate graceful shutdown of Envoy, kill if error
if err := proxy.Quit(); err != nil {
cdp.logger.Error("failed to stop proxy", "error", err)
cdp.logger.Error("failed to stop proxy, will attempt to kill", "error", err)
if err := proxy.Kill(); err != nil {
cdp.logger.Error("failed to kill proxy", "error", err)
}
Expand All @@ -244,7 +244,7 @@ func (cdp *ConsulDataplane) Run(ctx context.Context) error {
cdp.logger.Error("failed to kill proxy", "error", err)
}
}
doneCh <- errors.New("proxy lifecycle maangement server exited unexpectedly")
doneCh <- errors.New("proxy lifecycle management server exited unexpectedly")
}
}()
return <-doneCh
Expand Down Expand Up @@ -280,7 +280,7 @@ func (cdp *ConsulDataplane) envoyProxyConfig(cfg []byte) envoy.ProxyConfig {
"--drain-strategy": cdp.cfg.Envoy.EnvoyDrainStrategy,
}

// Users could set the Envoy concurrency, drain time, or drain strategy as an
// Users could set the Envoy concurrency, drain time, or drain strategy as
// extra args. Prioritize values set in that way over passthrough or defaults
// from consul-dataplane.
for envoyArg, cdpEnvoyValue := range envoyArgs {
Expand Down

0 comments on commit aadfeed

Please sign in to comment.