register fix
This commit is contained in:
parent
73d302d2c3
commit
0b035dfcc9
@ -51,6 +51,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(),
|
||||
@ -58,6 +62,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(),
|
||||
},
|
||||
@ -92,7 +97,7 @@ 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("http://%s/health", s.GetFullAddr())
|
||||
req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
|
||||
if err != nil {
|
||||
return false, ErrServiceUnavailable
|
||||
@ -112,6 +117,13 @@ func (s *Service) check() (bool, error) {
|
||||
return false, ErrServiceUnavailable
|
||||
}
|
||||
|
||||
func (s *Service) getMetadata() map[string]string {
|
||||
m := map[string]string{}
|
||||
m["traefik/http/services/"+s.Name+"/loadBalancer/servers/0/url"] = s.GetFullAddr()
|
||||
|
||||
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....
|
||||
|
Loading…
Reference in New Issue
Block a user