Compare commits
30 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 98d85810f3 | |||
| 3fc1191f6e | |||
| 52793ac244 | |||
| f8a1ae841d | |||
| 9d424742d6 | |||
| a9b73a6536 | |||
| 95584eb407 | |||
| ce7e2bc75a | |||
| 4bedc5d926 | |||
| ea7f98f8bb | |||
| bbdce9b25a | |||
| 1d75153698 | |||
| c177133daf | |||
| dad915f2ec | |||
| 54e4006d0d | |||
| 9cb590bf7a | |||
| 70c41dab96 | |||
| 99ac0a83c6 | |||
| 30c45b4503 | |||
| 49f552bf68 | |||
| 6f875cbb94 | |||
| f9331deec1 | |||
| c29bb94c3d | |||
| 8d884eebda | |||
| 2f022919ff | |||
| 91eeb6f275 | |||
| dc34531c4f | |||
| 12a241de81 | |||
| ef2567e0b6 | |||
| bb410b3158 |
@@ -61,18 +61,29 @@ func (s *Service) GetID() string {
|
||||
}
|
||||
|
||||
func (s *Service) GetFullAddr() string {
|
||||
return fmt.Sprintf("https://%s:%d/", s.Address, s.port)
|
||||
return fmt.Sprintf("https://%s:%d/", s.domain, s.port)
|
||||
}
|
||||
|
||||
func (s *Service) Register() error {
|
||||
def := &consul.AgentServiceRegistration{
|
||||
ID: s.GetID(),
|
||||
ID: s.GetID(),
|
||||
// Kind: consul.ServiceKindConnectProxy,
|
||||
Name: s.Name,
|
||||
Address: s.Address,
|
||||
Port: s.port,
|
||||
Tags: s.getTags(),
|
||||
Connect: &consul.AgentServiceConnect{
|
||||
Native: true,
|
||||
// SidecarService: &consul.AgentServiceRegistration{
|
||||
// Port: s.port,
|
||||
// },
|
||||
},
|
||||
// Proxy: &consul.AgentServiceConnectProxyConfig{
|
||||
// DestinationServiceName: s.Name,
|
||||
// },
|
||||
Check: &consul.AgentServiceCheck{
|
||||
TTL: s.ttl.String(),
|
||||
Status: "passing",
|
||||
DeregisterCriticalServiceAfter: "10s",
|
||||
},
|
||||
}
|
||||
@@ -107,8 +118,15 @@ func (s *Service) Unregister() error {
|
||||
}
|
||||
|
||||
func (s *Service) Connect() (*connect.Service, error) {
|
||||
svc, err := connect.NewService(s.Name, s.client)
|
||||
// srvName := s.Name
|
||||
srvName := s.Name
|
||||
svc, err := connect.NewService(srvName, s.client)
|
||||
s.connect = svc
|
||||
cnf := svc.ServerTLSConfig()
|
||||
fmt.Printf("CONNECT SERVER:: %s CONFIG:: %v\n", srvName, cnf)
|
||||
for k, c := range cnf.Certificates {
|
||||
fmt.Printf("CONNECT CERT %d: %v", k, c)
|
||||
}
|
||||
|
||||
return svc, err
|
||||
}
|
||||
@@ -130,6 +148,7 @@ func (s *Service) healthCheck() (bool, error) {
|
||||
fmt.Printf("Sending HEALTH CHECK request to: %s\n", healthUrl)
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
fmt.Printf("Sending HEALTH CHECK request error: %v\n", err)
|
||||
return false
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
Reference in New Issue
Block a user