Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 03ec5a0a5a | |||
| fb251e3648 | |||
| 32a89d9747 | |||
| 3b6acdc195 | |||
| 128e3db0b6 | |||
| e0a18538d4 | |||
| d99436d2d6 |
@@ -2,7 +2,6 @@ package consul
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
@@ -82,9 +81,13 @@ func (s *Service) Register() error {
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
go func() { // TTL
|
go func() { // TTL
|
||||||
ticker := time.NewTicker(s.TTL)
|
interval := s.TTL - time.Second*2
|
||||||
|
ticker := time.NewTicker(interval)
|
||||||
for range ticker.C {
|
for range ticker.C {
|
||||||
s.healthCheck()
|
_, err := s.healthCheck()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("TTL Error: %v\n", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
@@ -115,13 +118,13 @@ func (s *Service) healthCheck() (bool, error) {
|
|||||||
|
|
||||||
if alive {
|
if alive {
|
||||||
if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
|
if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
|
||||||
log.Println("health-check pass err:" + err.Error())
|
return false, err
|
||||||
}
|
}
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := s.ConsulAgent.FailTTL("service:"+s.GetID(), ErrServiceUnavailable.Error()); err != nil {
|
if err := s.ConsulAgent.FailTTL("service:"+s.GetID(), ErrServiceUnavailable.Error()); err != nil {
|
||||||
log.Println("health-check fail err:" + err.Error())
|
return false, err
|
||||||
}
|
}
|
||||||
return false, ErrServiceUnavailable
|
return false, ErrServiceUnavailable
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user