diff --git a/client/consul.go b/client/consul.go index 2eb54b1e1..861387181 100644 --- a/client/consul.go +++ b/client/consul.go @@ -163,7 +163,7 @@ func (c *ConsulService) Deregister(task *structs.Task, allocID string) error { } c.logger.Printf("[INFO] consul: deregistering service %v with consul", service.Name) if err := c.deregisterService(service.Id); err != nil { - c.printDebugMessage("[DEBUG] consul: error in deregistering service %v from consul", service.Name) + c.printLogMessage("[DEBUG] consul: error in deregistering service %v from consul", service.Name) mErr.Errors = append(mErr.Errors, err) } } @@ -209,14 +209,14 @@ func (c *ConsulService) performSync() { // Add new services which Consul agent isn't aware of knownServices[service.Id] = struct{}{} if _, ok := consulServices[service.Id]; !ok { - c.logger.Printf("[INFO] consul: registering service %s with consul.", service.Name) + c.printLogMessage("[INFO] consul: registering service %s with consul.", service.Name) c.registerService(service, trackedTask.task, trackedTask.allocID) continue } // If a service has changed, re-register it with Consul agent if service.Hash() != c.serviceStates[service.Id] { - c.logger.Printf("[INFO] consul: reregistering service %s with consul.", service.Name) + c.printLogMessage("[INFO] consul: reregistering service %s with consul.", service.Name) c.registerService(service, trackedTask.task, trackedTask.allocID) continue } @@ -244,7 +244,7 @@ func (c *ConsulService) performSync() { for _, consulService := range consulServices { if _, ok := knownServices[consulService.ID]; !ok { delete(c.serviceStates, consulService.ID) - c.logger.Printf("[INFO] consul: deregistering service %v with consul", consulService.Service) + c.printLogMessage("[INFO] consul: deregistering service %v with consul", consulService.Service) c.deregisterService(consulService.ID) } } @@ -275,13 +275,13 @@ func (c *ConsulService) registerService(service *structs.Service, task *structs. } if err := c.client.ServiceRegister(asr); err != nil { - c.printDebugMessage("[DEBUG] consul: error while registering service %v with consul: %v", service.Name, err) + c.printLogMessage("[DEBUG] consul: error while registering service %v with consul: %v", service.Name, err) mErr.Errors = append(mErr.Errors, err) } for _, check := range service.Checks { cr := c.makeCheck(service, check, host, port) if err := c.registerCheck(cr); err != nil { - c.printDebugMessage("[DEBUG] consul: error while registerting check %v with consul: %v", check.Name, err) + c.printLogMessage("[DEBUG] consul: error while registerting check %v with consul: %v", check.Name, err) mErr.Errors = append(mErr.Errors, err) } @@ -291,13 +291,13 @@ func (c *ConsulService) registerService(service *structs.Service, task *structs. // registerCheck registers a check with Consul func (c *ConsulService) registerCheck(check *consul.AgentCheckRegistration) error { - c.logger.Printf("[INFO] consul: registering check with ID: %v for service: %v", check.ID, check.ServiceID) + c.printLogMessage("[INFO] consul: registering check with ID: %v for service: %v", check.ID, check.ServiceID) return c.client.CheckRegister(check) } // deregisterCheck de-registers a check with a specific ID from Consul func (c *ConsulService) deregisterCheck(checkID string) error { - c.logger.Printf("[INFO] consul: removing check with ID: %v", checkID) + c.printLogMessage("[INFO] consul: removing check with ID: %v", checkID) return c.client.CheckDeregister(checkID) } @@ -339,7 +339,7 @@ func (c *ConsulService) makeCheck(service *structs.Service, check *structs.Servi return cr } -func (c *ConsulService) printDebugMessage(message string, v ...interface{}) { +func (c *ConsulService) printLogMessage(message string, v ...interface{}) { if _, ok := c.node.Attributes["consul.version"]; ok { c.logger.Printf(message, v) }