register fix

consul/discovery.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"net/http"
 	"strconv"
-	"strings"
 	"time"
 
 	consul "github.com/hashicorp/consul/api"
@@ -14,8 +13,8 @@ import (
 type Service struct {
 	AppID       string
 	Name        string
+	Domain      string
 	Address     string
-	IP          string
 	Port        int
 	TTL         time.Duration
 	ConsulAgent *consul.Agent
@@ -23,12 +22,12 @@ type Service struct {
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 
-func NewService(servAddr, id, appName, ip, domain string, appPort int) (*Service, error) {
+func NewService(servAddr, id, name, hostname, domain string, appPort int) (*Service, error) {
 	s := new(Service)
 	s.AppID = id
-	s.Name = strings.Replace(appName, "-", "", -1)
-	s.Address = domain
-	s.IP = ip
+	s.Name = name
+	s.Address = hostname
+	s.Domain = domain
 	s.Port = appPort
 	s.TTL = time.Second * 15
 
@@ -36,11 +35,6 @@ func NewService(servAddr, id, appName, ip, domain string, appPort int) (*Service
 	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
@@ -58,17 +52,17 @@ func (s *Service) GetID() string {
 }
 
 func (s *Service) GetFullAddr() string {
-	return fmt.Sprintf("http://%s:%d/", s.IP, s.Port)
+	return fmt.Sprintf("http://%s:%d/", s.Address, s.Port)
 }
 
 func (s *Service) Register() error {
 	def := &consul.AgentServiceRegistration{
 		ID:      s.GetID(),
 		Name:    s.Name,
-		Address: s.IP,
+		Address: s.Address,
 		Port:    s.Port,
 		Tags:    s.getTags(),
-		Meta:    s.getMetadata(),
+		// Meta:    s.getMetadata(),
 		Check: &consul.AgentServiceCheck{
 			TTL: s.TTL.String(),
 		},
@@ -77,7 +71,6 @@ func (s *Service) Register() error {
 	if err := s.ConsulAgent.ServiceRegister(def); err != nil {
 		return err
 	}
-	// s.ConsulAgent.
 	go s.UpdateTTL(def)
 
 	return nil
@@ -129,24 +122,14 @@ func (s *Service) check() (bool, error) {
 
 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....
-
 	tags := []string{
 		"traefik.enable=true",
-		"traefik.http.routers." + s.Name + ".rule=Host(`" + s.Address + "`)",
+		"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,