Compare commits

...

8 Commits

Author SHA1 Message Date
003bf2bb88 route rule change 2022-12-03 02:10:12 +01:00
03ec5a0a5a consul ttl fix 2022-12-02 19:02:21 +01:00
fb251e3648 consul ttl fix 2022-12-02 18:55:40 +01:00
32a89d9747 consul ttl fix 2022-12-02 18:48:12 +01:00
3b6acdc195 consul ttl fix 2022-12-02 17:42:39 +01:00
128e3db0b6 register fix 2022-12-02 16:18:00 +01:00
e0a18538d4 register fix 2022-12-02 14:24:27 +01:00
d99436d2d6 register fix 2022-12-02 14:21:33 +01:00

View File

@@ -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.Domain + "`)",
"traefik.http.routers." + s.Name + ".entryPoints=https",
"traefik.http.routers." + s.Name + ".tls=true",
"traefik.http.routers." + s.Name + ".service=" + s.Name,