consul fixes

consul/discovery.go

@@ -72,12 +72,7 @@ func (s *Service) Register() error {
 		Address: s.Address,
 		Port:    s.port,
 		Tags:    s.getTags(),
-		Connect: &consul.AgentServiceConnect{
-			Native: true,
-			// SidecarService: &consul.AgentServiceRegistration{
-			// 	Port: s.port,
-			// },
-		},
+		// Connect: &consul.AgentServiceConnect{Native: true},
 		// Proxy: &consul.AgentServiceConnectProxyConfig{
 		// 	DestinationServiceName: s.Name,
 		// },
@@ -92,16 +87,23 @@ func (s *Service) Register() error {
 		return err
 	}
 
-	go func(s *Service) { // startup register
+	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()
 			}
 		}
-	}(s)
+	}()
 
-	go func(s *Service) { // TTL
+	go func() { // TTL
 		interval := s.ttl - time.Second*2 // 2 seconds overhead
 		ticker := time.NewTicker(interval)
 		for range ticker.C {
@@ -109,21 +111,18 @@ func (s *Service) Register() error {
 				fmt.Printf("TTL Error #: %v\n", err)
 			}
 		}
-	}(s)
-
-	return nil
-}
-func (s *Service) Unregister() error {
-	return s.agent.ServiceDeregister(s.GetID())
+	}()
 }
 
 func (s *Service) Connect() (*connect.Service, error) {
-	// srvName := s.Name
-	srvName := s.Name
-	svc, err := connect.NewService(srvName, s.client)
+	// 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", 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)
 	}