Compare commits

...

6 Commits

Author SHA1 Message Date
a1870e07b5 Debug 2023-06-29 15:27:36 +02:00
43c8dd3ad0 Debug 2023-06-29 15:24:59 +02:00
e57e43188c Recognization of ping request for consul 2023-06-29 15:18:35 +02:00
672a350f31 Recognization of ping request for consul 2023-06-29 15:15:03 +02:00
c01098b672 Now SVC must be working in full TLS mode 2023-06-29 15:06:12 +02:00
566cbbd31b Consul refactor 2023-06-29 14:34:25 +02:00
2 changed files with 9 additions and 5 deletions

View File

@@ -91,5 +91,5 @@ func (c *HttpClient) getApiUrl(api string) string {
apiAddr = api // default api run on 80 int port
}
return "http://" + apiAddr
return "https://" + apiAddr
}

View File

@@ -21,7 +21,7 @@ type Service struct {
ttl time.Duration
client *consul.Client
agent *consul.Agent
connect *consul.Connect
connect *connect.Service
kv *consul.KV
}
@@ -61,7 +61,7 @@ func (s *Service) GetID() string {
}
func (s *Service) GetFullAddr() string {
return fmt.Sprintf("http://%s:%d/", s.Address, s.port)
return fmt.Sprintf("https://%s:%d/", s.Address, s.port)
}
func (s *Service) Register() error {
@@ -107,7 +107,10 @@ func (s *Service) Unregister() error {
}
func (s *Service) Connect() (*connect.Service, error) {
return connect.NewService(s.Name, s.client)
svc, err := connect.NewService(s.Name, s.client)
s.connect = svc
return svc, err
}
func (s *Service) KV() *consul.KV {
@@ -117,13 +120,14 @@ func (s *Service) KV() *consul.KV {
func (s *Service) healthCheck() (bool, error) {
alive := func() bool {
client := &http.Client{}
healthUrl := s.GetFullAddr() + "health"
healthUrl := fmt.Sprintf("%s%s?name=%s", s.GetFullAddr(), "health", s.Name)
req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
if err != nil {
return false
}
req.Header.Set("User-Agent", "service/internal")
fmt.Printf("Sending HEALTH CHECK request to: %s\n", healthUrl)
resp, err := client.Do(req)
if err != nil {
return false