Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 30c45b4503 | |||
| 49f552bf68 | |||
| 6f875cbb94 | |||
| f9331deec1 | |||
| c29bb94c3d | |||
| 8d884eebda | |||
| 2f022919ff | |||
| 91eeb6f275 | |||
| dc34531c4f | |||
| 12a241de81 | |||
| ef2567e0b6 | |||
| bb410b3158 | |||
| 7bbc717786 | |||
| a1870e07b5 |
@@ -61,7 +61,7 @@ func (s *Service) GetID() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) GetFullAddr() string {
|
func (s *Service) GetFullAddr() string {
|
||||||
return fmt.Sprintf("https://%s:%d/", s.Address, s.port)
|
return fmt.Sprintf("http://%s:%d/", s.domain, s.port)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) Register() error {
|
func (s *Service) Register() error {
|
||||||
@@ -71,8 +71,10 @@ func (s *Service) Register() error {
|
|||||||
Address: s.Address,
|
Address: s.Address,
|
||||||
Port: s.port,
|
Port: s.port,
|
||||||
Tags: s.getTags(),
|
Tags: s.getTags(),
|
||||||
|
Connect: &consul.AgentServiceConnect{SidecarService: &consul.AgentServiceRegistration{}},
|
||||||
Check: &consul.AgentServiceCheck{
|
Check: &consul.AgentServiceCheck{
|
||||||
TTL: s.ttl.String(),
|
TTL: s.ttl.String(),
|
||||||
|
Status: "passing",
|
||||||
DeregisterCriticalServiceAfter: "10s",
|
DeregisterCriticalServiceAfter: "10s",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -107,8 +109,15 @@ func (s *Service) Unregister() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) Connect() (*connect.Service, error) {
|
func (s *Service) Connect() (*connect.Service, error) {
|
||||||
svc, err := connect.NewService(s.Name, s.client)
|
// srvName := s.Name
|
||||||
|
srvName := s.Name
|
||||||
|
fmt.Printf("CONNECT SERVER: %s\n", srvName)
|
||||||
|
svc, err := connect.NewService(srvName, s.client)
|
||||||
s.connect = svc
|
s.connect = svc
|
||||||
|
cnf := svc.ServerTLSConfig()
|
||||||
|
for k, c := range cnf.Certificates {
|
||||||
|
fmt.Printf("CONNECT CERT %d: %v", k, c)
|
||||||
|
}
|
||||||
|
|
||||||
return svc, err
|
return svc, err
|
||||||
}
|
}
|
||||||
@@ -127,13 +136,18 @@ func (s *Service) healthCheck() (bool, error) {
|
|||||||
}
|
}
|
||||||
req.Header.Set("User-Agent", "service/internal")
|
req.Header.Set("User-Agent", "service/internal")
|
||||||
|
|
||||||
fmt.Printf("Sending HEALTH CHECK request to: %s", healthUrl)
|
fmt.Printf("Sending HEALTH CHECK request to: %s\n", healthUrl)
|
||||||
resp, err := client.Do(req)
|
resp, err := client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
fmt.Printf("Sending HEALTH CHECK request error: %v\n", err)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
var body []byte
|
||||||
|
resp.Body.Read(body)
|
||||||
|
fmt.Printf("HEALTH CHECK response to: %v -- %v\n", resp, body)
|
||||||
|
|
||||||
return resp.StatusCode == http.StatusOK
|
return resp.StatusCode == http.StatusOK
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user