Consul refactor

consul/discovery.go

@@ -19,8 +19,8 @@ type Service struct {
 	port       int
 	ttl        time.Duration
 	agent      *consul.Agent
+	connect    *consul.Connect
 	kv         *consul.KV
-	catalog    *consul.Catalog
 }
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
@@ -40,8 +40,8 @@ func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort
 		return nil, err
 	}
 	s.agent = client.Agent()
+	s.connect = client.Connect()
 	s.kv = client.KV()
-	s.catalog = client.Catalog()
 
 	return s, nil
 }
@@ -87,15 +87,15 @@ func (s *Service) Register() error {
 		}
 	}(s)
 
-	// go func(s *Service) { // TTL
+	go func(s *Service) { // TTL
-	// 	interval := s.ttl - time.Second*2 // 2 seconds overhead
+		interval := s.ttl - time.Second*2 // 2 seconds overhead
-	// 	ticker := time.NewTicker(interval)
+		ticker := time.NewTicker(interval)
-	// 	for range ticker.C {
+		for range ticker.C {
-	// 		if _, err := s.healthCheck(); err != nil {
+			if _, err := s.healthCheck(); err != nil {
-	// 			fmt.Printf("TTL Error #: %v\n", err)
+				fmt.Printf("TTL Error #: %v\n", err)
-	// 		}
+			}
-	// 	}
+		}
-	// }(s)
+	}(s)
 
 	return nil
 }
@@ -103,12 +103,12 @@ func (s *Service) Unregister() error {
 	return s.agent.ServiceDeregister(s.GetID())
 }
 
-func (s *Service) KV() *consul.KV {
+func (s *Service) Connect() *consul.Connect {
-	return s.kv
+	return s.connect
 }
 
-func (s *Service) Catalog() *consul.Catalog {
+func (s *Service) KV() *consul.KV {
-	return s.catalog
+	return s.kv
 }
 
 func (s *Service) healthCheck() (bool, error) {
@@ -119,7 +119,7 @@ func (s *Service) healthCheck() (bool, error) {
 		if err != nil {
 			return false
 		}
-		req.Header.Set("User-Agent", "Health Check")
+		req.Header.Set("User-Agent", "service/internal")
 
 		resp, err := client.Do(req)
 		if err != nil {
@@ -132,6 +132,7 @@ func (s *Service) healthCheck() (bool, error) {
 
 	if alive {
 		if err := s.agent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
+			fmt.Printf("Failed to pass TTL: %v", err)
 			return false, err
 		}
 		return true, nil