Compare commits

...

4 Commits

Author SHA1 Message Date
7bfd048051 Consul debug 2023-06-28 22:50:16 +02:00
1433b69abe Moar HR 2023-06-28 16:37:18 +02:00
c49ec85b3b update config lib 2023-06-21 20:48:32 +02:00
bdac1d5bc9 update configl lib 2023-06-21 20:45:46 +02:00

View File

@@ -6,6 +6,7 @@ import (
"strconv" "strconv"
"time" "time"
"git.pbiernat.dev/egommerce/go-api-pkg/config"
consul "github.com/hashicorp/consul/api" consul "github.com/hashicorp/consul/api"
) )
@@ -53,7 +54,7 @@ func newClientConfig(serverAddr string) *consul.Config {
} }
func (s *Service) GetID() string { func (s *Service) GetID() string {
return fmt.Sprintf("%s_%s", s.Name, s.appID) return fmt.Sprintf("%s:%s", s.Name, s.appID)
} }
func (s *Service) GetFullAddr() string { func (s *Service) GetFullAddr() string {
@@ -116,12 +117,14 @@ func (s *Service) healthCheck() (bool, error) {
healthUrl := s.GetFullAddr() + "health" healthUrl := s.GetFullAddr() + "health"
req, err := http.NewRequest(http.MethodGet, healthUrl, nil) req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
if err != nil { if err != nil {
fmt.Printf("Failed to create new Consul request: %v\n", err)
return false return false
} }
req.Header.Set("User-Agent", "Health Check") req.Header.Set("User-Agent", "Health Check")
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
fmt.Printf("Failed to send Consul request: %v\n", err)
return false return false
} }
defer resp.Body.Close() defer resp.Body.Close()
@@ -153,7 +156,7 @@ func (s *Service) getTags() []string {
"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http", "traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port), "traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false", "traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL="", "traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", ""),
// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authRequestHeaders=Cookie", // "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authRequestHeaders=Cookie",
// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authResponseHeaders=Set-Cookie, Server", // "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authResponseHeaders=Set-Cookie, Server",
// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true", // "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",