Compare commits
23 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 |
@@ -66,11 +66,21 @@ 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(),
|
||||||
|
// Kind: consul.ServiceKindConnectProxy,
|
||||||
Name: s.Name,
|
Name: s.Name,
|
||||||
Address: s.Address,
|
Address: s.Address,
|
||||||
Port: s.port,
|
Port: s.port,
|
||||||
Tags: s.getTags(),
|
Tags: s.getTags(),
|
||||||
|
Connect: &consul.AgentServiceConnect{
|
||||||
|
Native: true,
|
||||||
|
// SidecarService: &consul.AgentServiceRegistration{
|
||||||
|
// Port: s.port,
|
||||||
|
// },
|
||||||
|
},
|
||||||
|
// Proxy: &consul.AgentServiceConnectProxyConfig{
|
||||||
|
// DestinationServiceName: s.Name,
|
||||||
|
// },
|
||||||
Check: &consul.AgentServiceCheck{
|
Check: &consul.AgentServiceCheck{
|
||||||
TTL: s.ttl.String(),
|
TTL: s.ttl.String(),
|
||||||
Status: "passing",
|
Status: "passing",
|
||||||
@@ -109,11 +119,11 @@ func (s *Service) Unregister() error {
|
|||||||
|
|
||||||
func (s *Service) Connect() (*connect.Service, error) {
|
func (s *Service) Connect() (*connect.Service, error) {
|
||||||
// srvName := s.Name
|
// srvName := s.Name
|
||||||
srvName := "egommerce"
|
srvName := s.Name
|
||||||
fmt.Printf("CONNECT SERVER: %s\n", srvName)
|
|
||||||
svc, err := connect.NewService(srvName, s.client)
|
svc, err := connect.NewService(srvName, s.client)
|
||||||
s.connect = svc
|
s.connect = svc
|
||||||
cnf := svc.ServerTLSConfig()
|
cnf := svc.ServerTLSConfig()
|
||||||
|
fmt.Printf("CONNECT SERVER:: %s CONFIG:: %v\n", srvName, cnf)
|
||||||
for k, c := range cnf.Certificates {
|
for k, c := range cnf.Certificates {
|
||||||
fmt.Printf("CONNECT CERT %d: %v", k, c)
|
fmt.Printf("CONNECT CERT %d: %v", k, c)
|
||||||
}
|
}
|
||||||
@@ -138,6 +148,7 @@ func (s *Service) healthCheck() (bool, error) {
|
|||||||
fmt.Printf("Sending HEALTH CHECK request to: %s\n", 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()
|
||||||
|
|||||||
Reference in New Issue
Block a user