Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fc88125fe4 | |||
| 0aa79c7d35 | |||
| d484c0e3b0 | |||
| 7a35d1f44a |
@@ -33,7 +33,7 @@ func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort
|
|||||||
s.domain = domain
|
s.domain = domain
|
||||||
s.pathPrefix = pathPrefix
|
s.pathPrefix = pathPrefix
|
||||||
s.port = appPort
|
s.port = appPort
|
||||||
s.ttl = time.Second * 15
|
s.ttl = time.Second * 10
|
||||||
|
|
||||||
client, err := consul.NewClient(newClientConfig(servAddr))
|
client, err := consul.NewClient(newClientConfig(servAddr))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -70,7 +70,7 @@ func (s *Service) Register() error {
|
|||||||
Tags: s.getTags(),
|
Tags: s.getTags(),
|
||||||
Check: &consul.AgentServiceCheck{
|
Check: &consul.AgentServiceCheck{
|
||||||
TTL: s.ttl.String(),
|
TTL: s.ttl.String(),
|
||||||
DeregisterCriticalServiceAfter: "5s",
|
DeregisterCriticalServiceAfter: "10s",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,7 +79,7 @@ func (s *Service) Register() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
go func(s *Service) { // startup register
|
go func(s *Service) { // startup register
|
||||||
ticker := time.NewTicker(time.Millisecond * 100)
|
ticker := time.NewTicker(time.Second * 1)
|
||||||
for range ticker.C {
|
for range ticker.C {
|
||||||
if ok, _ := s.healthCheck(); ok {
|
if ok, _ := s.healthCheck(); ok {
|
||||||
ticker.Stop()
|
ticker.Stop()
|
||||||
@@ -87,15 +87,15 @@ func (s *Service) Register() error {
|
|||||||
}
|
}
|
||||||
}(s)
|
}(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
|
return nil
|
||||||
}
|
}
|
||||||
@@ -117,14 +117,12 @@ func (s *Service) healthCheck() (bool, error) {
|
|||||||
healthUrl := s.GetFullAddr() + "health"
|
healthUrl := s.GetFullAddr() + "health"
|
||||||
req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
|
req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("Failed to create new Consul request: %v\n", err)
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
req.Header.Set("User-Agent", "Health Check")
|
req.Header.Set("User-Agent", "service/internal")
|
||||||
|
|
||||||
resp, err := client.Do(req)
|
resp, err := client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("Failed to send Consul request: %v\n", err)
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
@@ -134,6 +132,7 @@ func (s *Service) healthCheck() (bool, error) {
|
|||||||
|
|
||||||
if alive {
|
if alive {
|
||||||
if err := s.agent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
|
if err := s.agent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
|
||||||
|
fmt.Printf("Failed to pass TTL: %v", err)
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
return true, nil
|
return true, nil
|
||||||
|
|||||||
Reference in New Issue
Block a user