register fix

consul/discovery.go

@@ -23,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 = 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
@@ -72,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
@@ -87,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)
 			}
 		}
 	}
@@ -98,7 +106,8 @@ func (s *Service) UpdateTTL(service *consul.AgentServiceRegistration) {
 
 func (s *Service) check() (bool, error) {
 	client := &http.Client{}
-	healthUrl := fmt.Sprintf("http://%s/health", s.GetFullAddr())
+	healthUrl := fmt.Sprintf("%shealth", s.GetFullAddr())
+	fmt.Println("HCheck: " + healthUrl)
 	req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
 	if err != nil {
 		return false, ErrServiceUnavailable
@@ -120,10 +129,13 @@ func (s *Service) check() (bool, error) {
 
 func (s *Service) getMetadata() map[string]string {
 	m := map[string]string{}
-	key := fmt.Sprintf(`traefik/http/services/%s/loadBalancer/servers/0/url`, s.Name)
-	m[key] = s.GetFullAddr()
+	m[`traefik_dwa`] = "a"
 
-	fmt.Printf("netadata: %v", m)
+	// key := "traefik%2Ftest"
+	// key := "traefik/http/services/" + s.Name + "/loadBalancer/servers/0/url"
+	// m[key] = s.GetFullAddr()
+
+	// fmt.Printf("netadata: %v", m)
 
 	return m
 }