From 5bfd15e49e2ce70944079e75f650e5f5cffae02e Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 27 Sep 2016 11:20:42 -0400 Subject: [PATCH] AWS: include ELB name in health-check logging Makes more supportable --- pkg/cloudprovider/providers/aws/aws_loadbalancer.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go index f0d948daed0..2a4d6fd62d7 100644 --- a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go +++ b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go @@ -317,6 +317,8 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala // Makes sure that the health check for an ELB matches the configured listeners func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDescription, listeners []*elb.Listener) error { + name := aws.StringValue(loadBalancer.LoadBalancerName) + actual := loadBalancer.HealthCheck // Default AWS settings @@ -336,7 +338,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc } if expectedTarget == "" { - return fmt.Errorf("unable to determine health check port (no valid listeners)") + return fmt.Errorf("unable to determine health check port for %q (no valid listeners)", name) } if expectedTarget == orEmpty(actual.Target) && @@ -347,7 +349,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc return nil } - glog.V(2).Info("Updating load-balancer health-check") + glog.V(2).Info("Updating load-balancer health-check for %q", name) healthCheck := &elb.HealthCheck{} healthCheck.HealthyThreshold = &expectedHealthyThreshold @@ -362,7 +364,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc _, err := c.elb.ConfigureHealthCheck(request) if err != nil { - return fmt.Errorf("error configuring load-balancer health-check: %v", err) + return fmt.Errorf("error configuring load-balancer health-check for %q: %v", name, err) } return nil