consul ttl fix

consul/discovery.go

@@ -2,7 +2,6 @@ package consul
 
 import (
 	"fmt"
-	"log"
 	"net/http"
 	"strconv"
 	"time"
@@ -82,9 +81,14 @@ 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()
+			fmt.Println("HC call: ", time.Now().String())
+			_, err := s.healthCheck()
+			if err != nil {
+				fmt.Printf("TTL Error: %v\n", err)
+			}
 		}
 	}()
 
@@ -115,13 +119,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
 }
@@ -134,11 +138,11 @@ func (s *Service) getTags() []string {
 		"traefik.http.routers." + s.Name + ".tls=true",
 		"traefik.http.routers." + s.Name + ".service=" + s.Name,
 		"traefik.http.routers." + s.Name + ".middlewares=compress,requestid",
-		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
 		"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
 		"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.Port),
 		"traefik.http.middlewares.compress.compress=true",
 		"traefik.http.middlewares.requestid.plugin.requestid.headerName=X-Request-ID",
+		// "traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
 		// "traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + "=" + bFullAddr,
 		// "traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + ".url=" + bFullAddr,
 		// "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health",