Compare commits

...

9 Commits

Author SHA1 Message Date
7f2025ef6f add debug point 2024-07-20 14:18:08 +02:00
3afe78f9e3 fix in consul discovery 2024-07-19 17:06:39 +02:00
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
615281ae9a fix in consul discovery lib 2024-07-19 16:25:41 +02:00

View File

@@ -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,33 @@ 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.ttlTicker.Stop()
// s.hcTicker.Stop()
s.client.Catalog().Deregister(&consul.CatalogDeregistration{
Address: s.Address,
ServiceID: s.GetID(),
}, nil)
return s.agent.ServiceDeregister(s.GetID())
}
func (s *Service) RegisterHealthChecks() {
go func() { // startup register
ticker := time.NewTicker(time.Second * 1)
for range ticker.C {
t := time.NewTicker(time.Second)
for range t.C {
if ok, _ := s.healthCheck(); ok {
ticker.Stop()
t.Stop()
}
}
}()
go func() { // TTL
interval := s.ttl - (time.Second * 2) // 2 seconds overhead
ticker := time.NewTicker(interval)
for range ticker.C {
t := time.NewTicker(s.ttl)
for range t.C {
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)
t.Stop()
}
}
}()
@@ -152,6 +158,7 @@ func (s *Service) healthCheck() (bool, error) {
alive := func() bool {
client := &http.Client{}
healthUrl := fmt.Sprintf("%s%s?name=%s", s.GetFullAddr(), "health", s.Name)
fmt.Printf("HealthCheck URL: %s%s?name=%s", s.GetFullAddr(), "health", s.Name)
req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
if err != nil {
return false