added tls support...

consul/discovery.go

@@ -2,7 +2,6 @@ package consul
 
 import (
 	"fmt"
-	"log"
 	"net/http"
 	"strconv"
 	"time"
@@ -62,7 +61,6 @@ func (s *Service) Register() error {
 		Address: s.Address,
 		Port:    s.Port,
 		Tags:    s.getTags(),
-		// Meta:    s.getMetadata(),
 		Check: &consul.AgentServiceCheck{
 			TTL: s.TTL.String(),
 		},
@@ -71,7 +69,27 @@ func (s *Service) Register() error {
 	if err := s.ConsulAgent.ServiceRegister(def); err != nil {
 		return err
 	}
-	go s.UpdateTTL(def)
+
+	go func() { // startup register
+		ticker := time.NewTicker(time.Millisecond * 100)
+		for range ticker.C {
+			ok, _ := s.healthCheck()
+			if ok {
+				ticker.Stop()
+			}
+		}
+	}()
+
+	go func() { // TTL
+		interval := s.TTL - time.Second*2
+		ticker := time.NewTicker(interval)
+		for range ticker.C {
+			_, err := s.healthCheck()
+			if err != nil {
+				fmt.Printf("TTL Error: %v\n", err)
+			}
+		}
+	}()
 
 	return nil
 }
@@ -79,66 +97,53 @@ func (s *Service) Unregister() error {
 	return s.ConsulAgent.ServiceDeregister(s.GetID())
 }
 
-func (s *Service) UpdateTTL(service *consul.AgentServiceRegistration) {
-	ticker := time.NewTicker(s.TTL / 2)
-	for range ticker.C {
-		ok, err := s.check()
-		if !ok {
-			if err := s.ConsulAgent.FailTTL("service:"+s.GetID(), err.Error()); err != nil {
-				log.Println(err)
-				fmt.Println(err)
-			}
-		} else {
-			if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
-				log.Println(err)
-				fmt.Println(err)
-			}
+func (s *Service) healthCheck() (bool, error) {
+	alive := func() bool {
+		client := &http.Client{}
+		healthUrl := s.GetFullAddr() + "health"
+		req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
+		if err != nil {
+			return false
 		}
-	}
-}
+		req.Header.Set("User-Agent", "Health Check")
 
-func (s *Service) check() (bool, error) {
-	client := &http.Client{}
-	healthUrl := fmt.Sprintf("%shealth", s.GetFullAddr())
-	fmt.Println("HCheck: " + healthUrl)
-	req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
-	if err != nil {
-		return false, ErrServiceUnavailable
-	}
-	req.Header.Set("User-Agent", "Health Check")
+		resp, err := client.Do(req)
+		if err != nil {
+			return false
+		}
+		defer resp.Body.Close()
 
-	resp, err := client.Do(req)
-	if err != nil {
-		return false, ErrServiceUnavailable
-	}
-	defer resp.Body.Close()
+		return resp.StatusCode == http.StatusOK
+	}()
 
-	if resp.StatusCode == http.StatusOK {
+	if alive {
+		if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
+			return false, err
+		}
 		return true, nil
 	}
 
+	if err := s.ConsulAgent.FailTTL("service:"+s.GetID(), ErrServiceUnavailable.Error()); err != nil {
+		return false, err
+	}
 	return false, ErrServiceUnavailable
 }
 
-func (s *Service) getMetadata() map[string]string {
-	m := map[string]string{}
-
-	return m
-}
-
 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,
 		"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.tls.certificates.certfile=/certs/client.cert",
+		"traefik.tls.certificates.keyfile=/certs/client.key",
+		// "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",