egommerce/go-api-pkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

register fix

Browse Source
This commit is contained in:
Piotr Biernat 2022-12-02 03:22:36 +01:00
parent 2204f6116b
commit b8cfbf6b99
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
consul/discovery.go
View File

@ -62,7 +62,6 @@ func (s *Service) Register() error {
Address: s.Address, Address: s.Address,
Port: s.Port, Port: s.Port,
Tags: s.getTags(), Tags: s.getTags(),
// Meta: s.getMetadata(),
Check: &consul.AgentServiceCheck{ Check: &consul.AgentServiceCheck{
TTL: s.TTL.String(), TTL: s.TTL.String(),
}, },
@ -71,7 +70,23 @@ func (s *Service) Register() error {
if err := s.ConsulAgent.ServiceRegister(def); err != nil { if err := s.ConsulAgent.ServiceRegister(def); err != nil {
return err return err
} }
go s.UpdateTTL(def)
go func() { // startup register
ticker := time.NewTicker(time.Millisecond * 100)
for range ticker.C {
ok, _ := s.healthCheck()
if ok {
ticker.Stop()
}
}
}()
go func() { // TTL
ticker := time.NewTicker(s.TTL)
for range ticker.C {
s.healthCheck()
}
}()
return nil return nil
} }
@ -79,53 +94,38 @@ func (s *Service) Unregister() error {
return s.ConsulAgent.ServiceDeregister(s.GetID()) return s.ConsulAgent.ServiceDeregister(s.GetID())
} }
func (s *Service) UpdateTTL(service *consul.AgentServiceRegistration) { func (s *Service) healthCheck() (bool, error) {
ticker := time.NewTicker(s.TTL / 2) alive := func() bool {
for range ticker.C { client := &http.Client{}
ok, err := s.check() healthUrl := s.GetFullAddr() + "health"
if !ok { req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
if err := s.ConsulAgent.FailTTL("service:"+s.GetID(), err.Error()); err != nil { if err != nil {
log.Println(err) return false
fmt.Println(err)
}
} else {
if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
log.Println(err)
fmt.Println(err)
}
} }
} req.Header.Set("User-Agent", "Health Check")
}
func (s *Service) check() (bool, error) { resp, err := client.Do(req)
client := &http.Client{} if err != nil {
healthUrl := fmt.Sprintf("%shealth", s.GetFullAddr()) return false
fmt.Println("HCheck: " + healthUrl) }
req, err := http.NewRequest(http.MethodGet, healthUrl, nil) defer resp.Body.Close()
if err != nil {
return false, ErrServiceUnavailable
}
req.Header.Set("User-Agent", "Health Check")
resp, err := client.Do(req) return resp.StatusCode == http.StatusOK
if err != nil { }()
return false, ErrServiceUnavailable
}
defer resp.Body.Close()
if resp.StatusCode == http.StatusOK { if alive {
if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
log.Println("health-check pass err:" + err.Error())
}
return true, nil return true, nil
} }
if err := s.ConsulAgent.FailTTL("service:"+s.GetID(), ErrServiceUnavailable.Error()); err != nil {
log.Println("health-check fail err:" + err.Error())
}
return false, ErrServiceUnavailable return false, ErrServiceUnavailable
} }
func (s *Service) getMetadata() map[string]string {
m := map[string]string{}
return m
}
func (s *Service) getTags() []string { func (s *Service) getTags() []string {
tags := []string{ tags := []string{
"traefik.enable=true", "traefik.enable=true",