Compare commits

...

2 Commits

Author SHA1 Message Date
c454307d56 consul fixes 2024-04-19 19:17:09 +02:00
359a89ba62 consul fixes 2024-04-19 19:01:16 +02:00

View File

@ -109,7 +109,7 @@ func (s *Service) RegisterHealthChecks() {
}() }()
go func() { // TTL go func() { // 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 {
@ -149,17 +149,14 @@ func (s *Service) healthCheck() (bool, error) {
} }
req.Header.Set("User-Agent", "service/internal") req.Header.Set("User-Agent", "service/internal")
fmt.Printf("Sending HEALTH CHECK request to: %s\n", healthUrl)
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
fmt.Printf("Sending HEALTH CHECK request error: %v\n", err)
return false return false
} }
defer resp.Body.Close() defer resp.Body.Close()
var body []byte var body []byte
resp.Body.Read(body) resp.Body.Read(body)
fmt.Printf("HEALTH CHECK response to: %v -- %v\n", resp, body)
return resp.StatusCode == http.StatusOK return resp.StatusCode == http.StatusOK
}() }()
@ -183,7 +180,7 @@ func (s *Service) getTags() []string {
"traefik.enable=true", "traefik.enable=true",
"traefik.http.routers." + s.Name + ".rule=PathPrefix(`" + s.pathPrefix + "`)", "traefik.http.routers." + s.Name + ".rule=PathPrefix(`" + s.pathPrefix + "`)",
"traefik.http.routers." + s.Name + ".entryPoints=https", "traefik.http.routers." + s.Name + ".entryPoints=https",
"traefik.http.routers." + s.Name + ".tls=true", // "traefik.http.routers." + s.Name + ".tls=true",
"traefik.http.routers." + s.Name + ".service=" + s.Name, "traefik.http.routers." + s.Name + ".service=" + s.Name,
"traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",requestid_" + s.Name + ",stripprefix_" + s.Name, "traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",requestid_" + s.Name + ",stripprefix_" + s.Name,
"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http", "traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",