register fix

consul/discovery.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"strconv"
+	"strings"
 	"time"
 
 	consul "github.com/hashicorp/consul/api"
@@ -21,19 +23,24 @@ type Service struct {
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 
-func NewService(serverAddr, appID, appName, ip, domain string, appPort int) (*Service, error) {
+func NewService(servAddr, id, appName, ip, domain string, appPort int) (*Service, error) {
 	s := new(Service)
-	s.AppID = appID
+	s.AppID = id
-	s.Name = appName
+	s.Name = strings.Replace(appName, "-", "", -1)
 	s.Address = domain
 	s.IP = ip
 	s.Port = appPort
 	s.TTL = time.Second * 15
 
-	client, err := consul.NewClient(newClientConfig(serverAddr))
+	client, err := consul.NewClient(newClientConfig(servAddr))
 	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
@@ -46,13 +53,22 @@ func newClientConfig(serverAddr string) *consul.Config {
 	return conf
 }
 
+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.Name + "_" + s.AppID,
+		ID:      s.GetID(),
 		Name:    s.Name,
 		Address: s.IP,
 		Port:    s.Port,
 		Tags:    s.getTags(),
+		Meta:    s.getMetadata(),
 		Check: &consul.AgentServiceCheck{
 			TTL: s.TTL.String(),
 		},
@@ -61,12 +77,13 @@ func (s *Service) Register() error {
 	if err := s.ConsulAgent.ServiceRegister(def); err != nil {
 		return err
 	}
+	// s.ConsulAgent.
 	go s.UpdateTTL(def)
 
 	return nil
 }
 func (s *Service) Unregister() error {
-	return s.ConsulAgent.ServiceDeregister(s.Name + "_" + s.AppID)
+	return s.ConsulAgent.ServiceDeregister(s.GetID())
 }
 
 func (s *Service) UpdateTTL(service *consul.AgentServiceRegistration) {
@@ -74,12 +91,14 @@ func (s *Service) UpdateTTL(service *consul.AgentServiceRegistration) {
 	for range ticker.C {
 		ok, err := s.check()
 		if !ok {
-			if err := s.ConsulAgent.FailTTL("service:"+s.Name+"_"+s.AppID, err.Error()); err != nil {
+			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.Name+"_"+s.AppID, "OK"); err != nil {
+			if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
 				log.Println(err)
+				fmt.Println(err)
 			}
 		}
 	}
@@ -87,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
@@ -107,26 +127,39 @@ 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)
+	// 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....
+	// bFullAddr := fmt.Sprintf("http://%s:%d/", s.IP, s.Port) // FIXME: declare one once - dont need to refresh....
 
 	tags := []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.routers." + s.Name + ".middlewares=compress,requestid",
-		"traefik.http.routers." + s.Name + ".tls=true",
-		// "traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
-		// "traefik.http.services." + s.Name + ".loadbalancer.server.port=" + port,
 		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
-		"traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + "=" + bFullAddr,
+		"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
-		"traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + ".url=" + bFullAddr,
+		"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." + fullName + ".loadbalancer.healthcheck.path=/health",
+		// "traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + "=" + bFullAddr,
-		// "traefik.http.services." + fullName + ".loadbalancer.healthcheck.interval=10s",
+		// "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",
 	}
 
 	return tags