consul fixes

consul/discovery.go

@@ -61,18 +61,29 @@ func (s *Service) GetID() string {
 }
 
 func (s *Service) GetFullAddr() string {
-	return fmt.Sprintf("https://%s:%d/", s.Address, s.port)
+	isTLS := s.port == 443
+	proto := "http"
+	if isTLS {
+		proto = "https"
+	}
+	return fmt.Sprintf("%s://%s:%d/", proto, s.domain, s.port)
 }
 
 func (s *Service) Register() error {
 	def := &consul.AgentServiceRegistration{
-		ID:      s.GetID(),
+		ID: s.GetID(),
+		// Kind:    consul.ServiceKindConnectProxy,
 		Name:    s.Name,
 		Address: s.Address,
 		Port:    s.port,
 		Tags:    s.getTags(),
+		// Connect: &consul.AgentServiceConnect{Native: true},
+		// Proxy: &consul.AgentServiceConnectProxyConfig{
+		// 	DestinationServiceName: s.Name,
+		// },
 		Check: &consul.AgentServiceCheck{
 			TTL:                            s.ttl.String(),
+			Status:                         "passing",
 			DeregisterCriticalServiceAfter: "10s",
 		},
 	}
@@ -81,34 +92,45 @@ func (s *Service) Register() error {
 		return err
 	}
 
-	go func(s *Service) { // startup register
-		ticker := time.NewTicker(time.Second * 1)
-		for range ticker.C {
-			if ok, _ := s.healthCheck(); ok {
-				ticker.Stop()
-			}
-		}
-	}(s)
-
-	go func(s *Service) { // TTL
-		interval := s.ttl - time.Second*2 // 2 seconds overhead
-		ticker := time.NewTicker(interval)
-		for range ticker.C {
-			if _, err := s.healthCheck(); err != nil {
-				fmt.Printf("TTL Error #: %v\n", err)
-			}
-		}
-	}(s)
-
 	return nil
 }
 func (s *Service) Unregister() error {
 	return s.agent.ServiceDeregister(s.GetID())
 }
 
+func (s *Service) RegisterHealthChecks() {
+	go func() { // startup register
+		ticker := time.NewTicker(time.Second * 1)
+		for range ticker.C {
+			if ok, _ := s.healthCheck(); ok {
+				ticker.Stop()
+			}
+		}
+	}()
+
+	go func() { // TTL
+		interval := s.ttl - (time.Second * 2) // 2 seconds overhead
+		ticker := time.NewTicker(interval)
+		for range ticker.C {
+			if _, err := s.healthCheck(); err != nil {
+				fmt.Printf("TTL Error #: %v\n", err)
+			}
+		}
+	}()
+}
+
 func (s *Service) Connect() (*connect.Service, error) {
+	// l := hclog.New(&hclog.LoggerOptions{
+	// 	Name:  "consul-registry",
+	// 	Level: hclog.Trace,
+	// })
 	svc, err := connect.NewService(s.Name, s.client)
 	s.connect = svc
+	cnf := svc.ServerTLSConfig()
+	fmt.Printf("CONNECT SERVER:: %s CONFIG:: %v\n", s.Name, cnf)
+	for k, c := range cnf.Certificates {
+		fmt.Printf("CONNECT CERT %d: %v", k, c)
+	}
 
 	return svc, err
 }
@@ -120,7 +142,7 @@ func (s *Service) KV() *consul.KV {
 func (s *Service) healthCheck() (bool, error) {
 	alive := func() bool {
 		client := &http.Client{}
-		healthUrl := s.GetFullAddr() + "health"
+		healthUrl := fmt.Sprintf("%s%s?name=%s", s.GetFullAddr(), "health", s.Name)
 		req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
 		if err != nil {
 			return false
@@ -133,6 +155,9 @@ func (s *Service) healthCheck() (bool, error) {
 		}
 		defer resp.Body.Close()
 
+		var body []byte
+		resp.Body.Read(body)
+
 		return resp.StatusCode == http.StatusOK
 	}()