fix in consul discovery

consul/discovery.go

@@ -23,6 +23,9 @@ type Service struct {
 	agent      *consul.Agent
 	connect    *connect.Service
 	kv         *consul.KV
+
+	hcTicker  *time.Ticker
+	ttlTicker *time.Ticker
 }
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
@@ -99,30 +102,32 @@ func (s *Service) Register() error {
 	return nil
 }
 func (s *Service) Unregister() error {
-	// s.client.Catalog().Deregister(&consul.CatalogDeregistration{
-	// 	Address:   s.Address,
-	// 	ServiceID: s.GetID(),
-	// }, nil)
+	s.client.Catalog().Deregister(&consul.CatalogDeregistration{
+		Address:   s.Address,
+		ServiceID: s.GetID(),
+	}, nil)
+
+	s.ttlTicker.Stop()
 
 	return s.agent.ServiceDeregister(s.GetID())
 }
 
 func (s *Service) RegisterHealthChecks() {
 	go func() { // startup register
-		ticker := time.NewTicker(time.Second * 1)
-		for range ticker.C {
+		s.hcTicker = time.NewTicker(time.Second)
+		for range s.hcTicker.C {
 			if ok, _ := s.healthCheck(); ok {
-				ticker.Stop()
+				s.hcTicker.Stop()
 			}
 		}
 	}()
 
 	go func() { // TTL
-		interval := s.ttl - (time.Second * 2) // 2 seconds overhead
-		ticker := time.NewTicker(interval)
-		for range ticker.C {
+		s.ttlTicker = time.NewTicker(s.ttl)
+		for range s.ttlTicker.C {
 			if _, err := s.healthCheck(); err != nil {
 				fmt.Printf("HealthCheck endpoint not available (%s)#: %v\n", s.GetFullAddr(), err)
+				// s.ttlTicker.Stop()
 			}
 		}
 	}()