Compare commits

...

18 Commits

Author SHA1 Message Date
ce7e2bc75a register fix 2 2023-07-05 23:37:55 +02:00
4bedc5d926 register fix 2 2023-07-05 23:35:17 +02:00
ea7f98f8bb register fix 2023-07-05 22:45:12 +02:00
bbdce9b25a register fix 2023-07-05 22:25:56 +02:00
1d75153698 consul register fix 2023-07-04 18:54:12 +02:00
c177133daf consul register fix 2023-07-04 18:46:00 +02:00
dad915f2ec consul register fix 2023-07-04 18:41:52 +02:00
54e4006d0d consul connect fixing 2023-07-04 00:02:23 +02:00
9cb590bf7a consul register as sidecar_service fix 2023-07-03 00:36:07 +02:00
70c41dab96 consul register as sidecar_service fix 2023-07-02 23:04:26 +02:00
99ac0a83c6 consul register as sidecar_service 2023-07-02 23:03:05 +02:00
30c45b4503 consul https temp fix 2023-07-02 22:38:13 +02:00
49f552bf68 consul register as sidecar_service 2023-07-02 22:30:53 +02:00
6f875cbb94 consul register as sidecar_service 2023-07-02 22:24:55 +02:00
f9331deec1 consul debug 2023-07-02 01:46:11 +02:00
c29bb94c3d consul debug 2023-07-02 01:32:45 +02:00
8d884eebda consul debug 2023-07-01 18:01:48 +02:00
2f022919ff consul debug 2023-07-01 17:57:30 +02:00

View File

@@ -61,16 +61,25 @@ func (s *Service) GetID() string {
}
func (s *Service) GetFullAddr() string {
return fmt.Sprintf("https://%s:%d/", s.domain, s.port)
return fmt.Sprintf("http://%s:%d/", s.domain, s.port)
}
func (s *Service) Register() error {
def := &consul.AgentServiceRegistration{
ID: s.GetID(),
// Kind: consul.ServiceKindConnectProxy,
Name: s.Name,
Address: s.Address,
Port: s.port,
Tags: s.getTags(),
Connect: &consul.AgentServiceConnect{
SidecarService: &consul.AgentServiceRegistration{
// Port: s.port,
},
},
// Proxy: &consul.AgentServiceConnectProxyConfig{
// DestinationServiceName: s.Name + "dupa",
// },
Check: &consul.AgentServiceCheck{
TTL: s.ttl.String(),
Status: "passing",
@@ -108,7 +117,10 @@ 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
fmt.Printf("CONNECT SERVER: %s\n", srvName)
svc, err := connect.NewService(srvName, s.client)
s.connect = svc
cnf := svc.ServerTLSConfig()
for k, c := range cnf.Certificates {
@@ -135,6 +147,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()