register fix

consul/discovery.go

@@ -35,11 +35,6 @@ func NewService(servAddr, id, name, hostname, domain string, appPort int) (*Serv
 	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
@@ -67,7 +62,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(),
 		},
@@ -76,8 +70,23 @@ func (s *Service) Register() error {
 	if err := s.ConsulAgent.ServiceRegister(def); err != nil {
 		return err
 	}
-	// s.ConsulAgent.
-	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
+		ticker := time.NewTicker(s.TTL)
+		for range ticker.C {
+			s.healthCheck()
+		}
+	}()
 
 	return nil
 }
@@ -85,64 +94,39 @@ 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) check() (bool, error) {
+func (s *Service) healthCheck() (bool, error) {
+	alive := func() bool {
 		client := &http.Client{}
-	healthUrl := fmt.Sprintf("%shealth", s.GetFullAddr())
-	fmt.Println("HCheck: " + healthUrl)
+		healthUrl := s.GetFullAddr() + "health"
 		req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
 		if err != nil {
-		return false, ErrServiceUnavailable
+			return false
 		}
 		req.Header.Set("User-Agent", "Health Check")
 
 		resp, err := client.Do(req)
 		if err != nil {
-		return false, ErrServiceUnavailable
+			return false
 		}
 		defer resp.Body.Close()
 
-	if resp.StatusCode == http.StatusOK {
+		return resp.StatusCode == http.StatusOK
+	}()
+
+	if alive {
+		if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
+			log.Println("health-check pass err:" + err.Error())
+		}
 		return true, nil
 	}
 
+	if err := s.ConsulAgent.FailTTL("service:"+s.GetID(), ErrServiceUnavailable.Error()); err != nil {
+		log.Println("health-check fail err:" + err.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....
-
 	tags := []string{
 		"traefik.enable=true",
 		"traefik.http.routers." + s.Name + ".rule=Host(`" + s.Domain + "`)",