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