register fix

consul/discovery.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"strconv"
+	"strings"
 	"time"
 
 	consul "github.com/hashicorp/consul/api"
@@ -24,7 +26,7 @@ var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 func NewService(serverAddr, appID, appName, ip, domain string, appPort int) (*Service, error) {
 	s := new(Service)
 	s.AppID = appID
-	s.Name = appName
+	s.Name = strings.Replace(appName, "-", "", -1)
 	s.Address = domain
 	s.IP = ip
 	s.Port = appPort
@@ -34,6 +36,11 @@ func NewService(serverAddr, appID, appName, ip, domain string, appPort int) (*Se
 	if err != nil {
 		return nil, err
 	}
+	// kv := client.KV()
+	// obj := new(consul.KVPair)
+	// obj.Key = "traefik/http/services/" + s.Name + "/loadBalancer/servers/0/url"
+	// obj.Value = []byte(s.GetFullAddr())
+	// kv.Put(obj, nil)
 	s.ConsulAgent = client.Agent()
 
 	return s, nil
@@ -50,6 +57,10 @@ func (s *Service) GetID() string {
 	return fmt.Sprintf("%s_%s", s.Name, s.AppID)
 }
 
+func (s *Service) GetFullAddr() string {
+	return fmt.Sprintf("http://%s:%d/", s.IP, s.Port)
+}
+
 func (s *Service) Register() error {
 	def := &consul.AgentServiceRegistration{
 		ID:      s.GetID(),
@@ -57,6 +68,7 @@ func (s *Service) Register() error {
 		Address: s.IP,
 		Port:    s.Port,
 		Tags:    s.getTags(),
+		Meta:    s.getMetadata(),
 		Check: &consul.AgentServiceCheck{
 			TTL: s.TTL.String(),
 		},
@@ -65,6 +77,7 @@ func (s *Service) Register() error {
 	if err := s.ConsulAgent.ServiceRegister(def); err != nil {
 		return err
 	}
+	// s.ConsulAgent.
 	go s.UpdateTTL(def)
 
 	return nil
@@ -80,10 +93,12 @@ func (s *Service) UpdateTTL(service *consul.AgentServiceRegistration) {
 		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)
 			}
 		}
 	}
@@ -91,7 +106,8 @@ func (s *Service) UpdateTTL(service *consul.AgentServiceRegistration) {
 
 func (s *Service) check() (bool, error) {
 	client := &http.Client{}
-	healthUrl := fmt.Sprintf("http://%s:%d/health", s.IP, s.Port)
+	healthUrl := fmt.Sprintf("%shealth", s.GetFullAddr())
+	fmt.Println("HCheck: " + healthUrl)
 	req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
 	if err != nil {
 		return false, ErrServiceUnavailable
@@ -111,6 +127,19 @@ func (s *Service) check() (bool, error) {
 	return false, ErrServiceUnavailable
 }
 
+func (s *Service) getMetadata() map[string]string {
+	m := map[string]string{}
+	m[`traefik_dwa`] = "a"
+
+	// key := "traefik%2Ftest"
+	// key := "traefik/http/services/" + s.Name + "/loadBalancer/servers/0/url"
+	// m[key] = s.GetFullAddr()
+
+	// fmt.Printf("netadata: %v", m)
+
+	return m
+}
+
 func (s *Service) getTags() []string {
 	// fullName := fmt.Sprintf("%s-%s", s.Name, s.AppID)
 	// bFullAddr := fmt.Sprintf("http://%s:%d/", s.IP, s.Port) // FIXME: declare one once - dont need to refresh....
@@ -119,18 +148,18 @@ func (s *Service) getTags() []string {
 		"traefik.enable=true",
 		"traefik.http.routers." + s.Name + ".rule=Host(`" + s.Address + "`)",
 		"traefik.http.routers." + s.Name + ".entryPoints=https",
-		// "traefik.http.routers." + s.Name + ".tls=true",
-		// "traefik.http.routers." + s.Name + ".service=" + 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.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.servers." + fullName + "=" + bFullAddr,
 		// "traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + ".url=" + bFullAddr,
 		// "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health",
 		// "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.interval=10s",
-		// "traefik.http.routers." + s.Name + ".middlewares=compress,requestid",
-		// "traefik.http.middlewares.compress.compress=true",
-		// "traefik.http.middlewares.requestid.plugin.requestid.headerName=X-Request-ID",
 	}
 
 	return tags