consul fixes

consul/discovery.go

@@ -61,25 +61,26 @@ func (s *Service) GetID() string {
 }
 
 func (s *Service) GetFullAddr() string {
-	return fmt.Sprintf("http://%s:%d/", s.domain, 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(),
-		Kind:    consul.ServiceKindConnectProxy,
+		// Kind:    consul.ServiceKindConnectProxy,
 		Name:    s.Name,
 		Address: s.Address,
 		Port:    s.port,
 		Tags:    s.getTags(),
-		Connect: &consul.AgentServiceConnect{
+		// Connect: &consul.AgentServiceConnect{Native: true},
-			SidecarService: &consul.AgentServiceRegistration{
+		// Proxy: &consul.AgentServiceConnectProxyConfig{
-				// Port: s.port,
+		// 	DestinationServiceName: s.Name,
-			},
+		// },
-		},
-		Proxy: &consul.AgentServiceConnectProxyConfig{
-			DestinationServiceName: s.Name + "dupa",
-		},
 		Check: &consul.AgentServiceCheck{
 			TTL:                            s.ttl.String(),
 			Status:                         "passing",
@@ -91,38 +92,42 @@ 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) {
-	// srvName := s.Name
+	// l := hclog.New(&hclog.LoggerOptions{
-	srvName := s.Name
+	// 	Name:  "consul-registry",
-	fmt.Printf("CONNECT SERVER: %s\n", srvName)
+	// 	Level: hclog.Trace,
-	svc, err := connect.NewService(srvName, s.client)
+	// })
+	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)
 	}
@@ -144,17 +149,14 @@ func (s *Service) healthCheck() (bool, error) {
 		}
 		req.Header.Set("User-Agent", "service/internal")
 
-		fmt.Printf("Sending HEALTH CHECK request to: %s\n", healthUrl)
 		resp, err := client.Do(req)
 		if err != nil {
-			fmt.Printf("Sending HEALTH CHECK request error: %v\n", err)
 			return false
 		}
 		defer resp.Body.Close()
 
 		var body []byte
 		resp.Body.Read(body)
-		fmt.Printf("HEALTH CHECK response to: %v -- %v\n", resp, body)
 
 		return resp.StatusCode == http.StatusOK
 	}()