fix in consul discovery

config/config.go

@@ -3,7 +3,6 @@ package config
 import (
 	"os"
 
-	"github.com/gofiber/fiber/v2/log"
 	"github.com/joho/godotenv"
 )
 
@@ -16,7 +15,7 @@ func init() {
 func GetEnv(name string, defVal string) string {
 	env := os.Getenv(name)
 	if env == "" {
-		log.Panicf("Missing %s env variable", name)
+		return defVal
 	}
 
 	return env

consul/discovery.go

@@ -23,20 +23,27 @@ type Service struct {
 	agent      *consul.Agent
 	connect    *connect.Service
 	kv         *consul.KV
+
+	hcTicker  *time.Ticker
+	ttlTicker *time.Ticker
 }
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 
-func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort int) (*Service, error) {
+func NewService(servAddr, id, name, useDomainOverIp, addr, domain, pathPrefix string, appPort int) (*Service, error) {
 	s := new(Service)
 	s.Name = name
-	s.Address = hostname
+	s.Address = addr
 	s.appID = id
 	s.domain = domain
 	s.pathPrefix = pathPrefix
 	s.port = appPort
 	s.ttl = time.Second * 10
 
+	if useDomainOverIp == "true" { // FIXME types...
+		s.Address = domain
+	}
+
 	client, err := consul.NewClient(newClientConfig(servAddr))
 	if err != nil {
 		return nil, err
@@ -66,7 +73,7 @@ func (s *Service) GetFullAddr() string {
 	if isTLS {
 		proto = "https"
 	}
-	return fmt.Sprintf("%s://%s:%d/", proto, s.domain, s.port)
+	return fmt.Sprintf("%s://%s:%d/", proto, s.Address, s.port)
 }
 
 func (s *Service) Register() error {
@@ -95,25 +102,34 @@ func (s *Service) Register() error {
 	return nil
 }
 func (s *Service) Unregister() error {
+	// s.ttlTicker.Stop()
+	// s.hcTicker.Stop()
+
+	s.client.Catalog().Deregister(&consul.CatalogDeregistration{
+		Address:   s.Address,
+		ServiceID: s.GetID(),
+	}, nil)
+
 	return s.agent.ServiceDeregister(s.GetID())
 }
 
 func (s *Service) RegisterHealthChecks() {
 	go func() { // startup register
-		ticker := time.NewTicker(time.Second * 1)
-		for range ticker.C {
+		s.hcTicker = time.NewTicker(time.Second)
+		for range s.hcTicker.C {
 			if ok, _ := s.healthCheck(); ok {
-				ticker.Stop()
+				fmt.Println("Stoping HC Ticker goroutine")
+				s.hcTicker.Stop()
 			}
 		}
 	}()
 
 	go func() { // TTL
-		interval := s.ttl - (time.Second * 2) // 2 seconds overhead
-		ticker := time.NewTicker(interval)
-		for range ticker.C {
+		s.ttlTicker = time.NewTicker(s.ttl)
+		for range s.ttlTicker.C {
 			if _, err := s.healthCheck(); err != nil {
-				fmt.Printf("HealthCheck endpoint not available #: %v\n", err)
+				fmt.Printf("HealthCheck endpoint not available (%s)#: %v\n", s.GetFullAddr(), err)
+				s.ttlTicker.Stop()
 			}
 		}
 	}()
@@ -178,22 +194,27 @@ func (s *Service) healthCheck() (bool, error) {
 func (s *Service) getTags() []string {
 	tags := []string{
 		"traefik.enable=true",
+		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",
+		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authRequestHeaders=Cookie",
+		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authResponseHeaders=Set-Cookie, Server",
+		"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", "http://identity.service.ego.io/api/v1/traefik"),
+		"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
+		"traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
+		// "treafik.http.middlewares.retryif_" + s.Name + ".plugin.retryif.attempts=3",
+		// "treafik.http.middlewares.retryif_" + s.Name + ".plugin.retryif.statusCode=503",
 		"traefik.http.routers." + s.Name + ".rule=PathPrefix(`" + s.pathPrefix + "`)",
 		// "traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`)",
 		"traefik.http.routers." + s.Name + ".entryPoints=https",
 		// "traefik.http.routers." + s.Name + ".tls=true",
 		"traefik.http.routers." + s.Name + ".service=" + s.Name,
-		"traefik.http.routers." + s.Name + ".middlewares=stripprefix_" + 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 + ",stripprefix_" + s.Name,
+		"traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",stripprefix_" + s.Name + ",requestid_" + s.Name + "",
 		"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
 		"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
-		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
-		"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", ""),
-		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authRequestHeaders=Cookie",
-		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authResponseHeaders=Set-Cookie, Server",
-		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",
-		// "traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
-		"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
+		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=true",
+		"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.interval=1s",
+		"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.timeout=1s",
+		"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health",
 		"traefik.tls.certificates.certfile=/certs/client.cert",
 		"traefik.tls.certificates.keyfile=/certs/client.key",
 	}