consul fixes

consul/discovery.go

@@ -61,7 +61,12 @@ func (s *Service) GetID() string {
 }
 
 func (s *Service) GetFullAddr() string {
-	return fmt.Sprintf("https://%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 {
@@ -72,12 +77,7 @@ func (s *Service) Register() error {
 		Address: s.Address,
 		Port:    s.port,
 		Tags:    s.getTags(),
-		Connect: &consul.AgentServiceConnect{
+		// Connect: &consul.AgentServiceConnect{Native: true},
-			Native: true,
-			// SidecarService: &consul.AgentServiceRegistration{
-			// 	Port: s.port,
-			// },
-		},
 		// Proxy: &consul.AgentServiceConnectProxyConfig{
 		// 	DestinationServiceName: s.Name,
 		// },
@@ -98,7 +98,7 @@ func (s *Service) Unregister() error {
 	return s.agent.ServiceDeregister(s.GetID())
 }
 
-func (s *Service) InitHealthChecks() {
+func (s *Service) RegisterHealthChecks() {
 	go func() { // startup register
 		ticker := time.NewTicker(time.Second * 1)
 		for range ticker.C {
@@ -120,12 +120,14 @@ func (s *Service) InitHealthChecks() {
 }
 
 func (s *Service) Connect() (*connect.Service, error) {
-	// srvName := s.Name
+	// l := hclog.New(&hclog.LoggerOptions{
-	srvName := s.Name
+	// 	Name:  "consul-registry",
-	svc, err := connect.NewService(srvName, s.client)
+	// 	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", srvName, cnf)
+	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)
 	}