Compare commits

..

6 Commits

Author SHA1 Message Date
eb763ed49c fix in consul discovery 2024-07-19 16:52:54 +02:00
6537d79b19 fix in consul discovery 2024-07-19 16:48:08 +02:00
e55a2f42fe fix in consul discovery 2024-07-19 16:45:42 +02:00
82d68e91b8 fix in consul discovery 2024-07-19 16:41:37 +02:00
767eb5688c fix in consul discovery 2024-07-19 16:39:11 +02:00
37fa05402e fix in consul discovery 2024-07-19 16:30:04 +02:00

View File

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