Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ad4368cdf8 | |||
| a4f4b6e059 | |||
| 5bf58aad16 | |||
| ba6bd4137c | |||
| 48a7e968d1 | |||
| 6c46a0e6a4 |
@@ -26,7 +26,7 @@ var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
|
|||||||
func NewService(serverAddr, appID, appName, ip, domain string, appPort int) (*Service, error) {
|
func NewService(serverAddr, appID, appName, ip, domain string, appPort int) (*Service, error) {
|
||||||
s := new(Service)
|
s := new(Service)
|
||||||
s.AppID = appID
|
s.AppID = appID
|
||||||
s.Name = appName
|
s.Name = strings.Replace(appName, "-", "", -1)
|
||||||
s.Address = domain
|
s.Address = domain
|
||||||
s.IP = ip
|
s.IP = ip
|
||||||
s.Port = appPort
|
s.Port = appPort
|
||||||
@@ -36,6 +36,11 @@ func NewService(serverAddr, appID, appName, ip, domain string, appPort int) (*Se
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
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()
|
s.ConsulAgent = client.Agent()
|
||||||
|
|
||||||
return s, nil
|
return s, nil
|
||||||
@@ -59,7 +64,7 @@ func (s *Service) GetFullAddr() string {
|
|||||||
func (s *Service) Register() error {
|
func (s *Service) Register() error {
|
||||||
def := &consul.AgentServiceRegistration{
|
def := &consul.AgentServiceRegistration{
|
||||||
ID: s.GetID(),
|
ID: s.GetID(),
|
||||||
Name: strings.Replace(s.Name, "-", "_", -1),
|
Name: s.Name,
|
||||||
Address: s.IP,
|
Address: s.IP,
|
||||||
Port: s.Port,
|
Port: s.Port,
|
||||||
Tags: s.getTags(),
|
Tags: s.getTags(),
|
||||||
@@ -72,6 +77,7 @@ func (s *Service) Register() error {
|
|||||||
if err := s.ConsulAgent.ServiceRegister(def); err != nil {
|
if err := s.ConsulAgent.ServiceRegister(def); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
// s.ConsulAgent.
|
||||||
go s.UpdateTTL(def)
|
go s.UpdateTTL(def)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -120,7 +126,13 @@ func (s *Service) check() (bool, error) {
|
|||||||
|
|
||||||
func (s *Service) getMetadata() map[string]string {
|
func (s *Service) getMetadata() map[string]string {
|
||||||
m := map[string]string{}
|
m := map[string]string{}
|
||||||
m["traefik/http/services/"+s.Name+"/loadBalancer/servers/0/url"] = s.GetFullAddr()
|
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
|
return m
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user