Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d484c0e3b0 | |||
| 7a35d1f44a | |||
| 7bfd048051 | |||
| 1433b69abe | |||
| c49ec85b3b |
@@ -54,7 +54,7 @@ func newClientConfig(serverAddr string) *consul.Config {
|
||||
}
|
||||
|
||||
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 {
|
||||
@@ -92,7 +92,7 @@ func (s *Service) Register() error {
|
||||
ticker := time.NewTicker(interval)
|
||||
for range ticker.C {
|
||||
if _, err := s.healthCheck(); err != nil {
|
||||
fmt.Printf("TTL Error: %v\n", err)
|
||||
fmt.Printf("TTL Error #: %v\n", err)
|
||||
}
|
||||
}
|
||||
}(s)
|
||||
@@ -115,14 +115,17 @@ func (s *Service) healthCheck() (bool, error) {
|
||||
alive := func() bool {
|
||||
client := &http.Client{}
|
||||
healthUrl := s.GetFullAddr() + "health"
|
||||
fmt.Printf("Sending request to the %s\n", healthUrl)
|
||||
req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
|
||||
if err != nil {
|
||||
fmt.Printf("Failed to create new Consul request: %v\n", err)
|
||||
return false
|
||||
}
|
||||
req.Header.Set("User-Agent", "Health Check")
|
||||
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
fmt.Printf("Failed to send Consul request: %v\n", err)
|
||||
return false
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
@@ -154,7 +157,7 @@ func (s *Service) getTags() []string {
|
||||
"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.passhostheader=false",
|
||||
"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL"),
|
||||
"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.authResponseHeaders=Set-Cookie, Server",
|
||||
// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",
|
||||
|
||||
Reference in New Issue
Block a user