Fix: changed GetFullAddr() method: add debug point

consul/discovery.go

@@ -27,16 +27,20 @@ type Service struct {
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 
-func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort int) (*Service, error) {
+func NewService(servAddr, id, name, useDomainOverIp, addr, domain, pathPrefix string, appPort int) (*Service, error) {
 	s := new(Service)
 	s.Name = name
-	s.Address = hostname
+	s.Address = addr
 	s.appID = id
 	s.domain = domain
 	s.pathPrefix = pathPrefix
 	s.port = appPort
 	s.ttl = time.Second * 10
 
+	if useDomainOverIp == "true" { // FIXME types...
+		s.Address = domain
+	}
+
 	client, err := consul.NewClient(newClientConfig(servAddr))
 	if err != nil {
 		return nil, err
@@ -66,7 +70,7 @@ func (s *Service) GetFullAddr() string {
 	if isTLS {
 		proto = "https"
 	}
-	return fmt.Sprintf("%s://%s:%d/", proto, s.domain, s.port)
+	return fmt.Sprintf("%s://%s:%d/", proto, s.Address, s.port)
 }
 
 func (s *Service) Register() error {
@@ -95,10 +99,10 @@ func (s *Service) Register() error {
 	return nil
 }
 func (s *Service) Unregister() error {
-	s.client.Catalog().Deregister(&consul.CatalogDeregistration{
-		Address:   s.Address,
-		ServiceID: s.GetID(),
-	}, nil)
+	// s.client.Catalog().Deregister(&consul.CatalogDeregistration{
+	// 	Address:   s.Address,
+	// 	ServiceID: s.GetID(),
+	// }, nil)
 
 	return s.agent.ServiceDeregister(s.GetID())
 }
@@ -118,7 +122,7 @@ func (s *Service) RegisterHealthChecks() {
 		ticker := time.NewTicker(interval)
 		for range ticker.C {
 			if _, err := s.healthCheck(); err != nil {
-				fmt.Printf("HealthCheck endpoint not available #: %v\n", err)
+				fmt.Printf("HealthCheck endpoint not available (%s)#: %v\n", s.GetFullAddr(), err)
 			}
 		}
 	}()