Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7c69590a1d | |||
| d5f0314b58 | |||
| 4f183541e6 | |||
| 003bf2bb88 | |||
| 03ec5a0a5a | |||
| fb251e3648 | |||
| 32a89d9747 | |||
| 3b6acdc195 | |||
| 128e3db0b6 | |||
| e0a18538d4 | |||
| d99436d2d6 |
@@ -2,7 +2,6 @@ package consul
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
@@ -82,9 +81,13 @@ func (s *Service) Register() error {
|
||||
}()
|
||||
|
||||
go func() { // TTL
|
||||
ticker := time.NewTicker(s.TTL)
|
||||
interval := s.TTL - time.Second*2
|
||||
ticker := time.NewTicker(interval)
|
||||
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 err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
|
||||
log.Println("health-check pass err:" + err.Error())
|
||||
return false, err
|
||||
}
|
||||
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, err
|
||||
}
|
||||
return false, ErrServiceUnavailable
|
||||
}
|
||||
@@ -129,7 +132,7 @@ func (s *Service) healthCheck() (bool, error) {
|
||||
func (s *Service) getTags() []string {
|
||||
tags := []string{
|
||||
"traefik.enable=true",
|
||||
"traefik.http.routers." + s.Name + ".rule=Host(`" + s.Domain + "`)",
|
||||
"traefik.http.routers." + s.Name + ".rule=Headers(`X-API-SERVICE`, `" + s.Name + "`)",
|
||||
"traefik.http.routers." + s.Name + ".entryPoints=https",
|
||||
"traefik.http.routers." + s.Name + ".tls=true",
|
||||
"traefik.http.routers." + s.Name + ".service=" + s.Name,
|
||||
|
||||
Reference in New Issue
Block a user