Compare commits

...

6 Commits

Author SHA1 Message Date
0aa79c7d35 Consul debug and clean 2023-06-28 23:07:10 +02:00
d484c0e3b0 Consul debug 2023-06-28 22:59:31 +02:00
7a35d1f44a Consul debug 2023-06-28 22:54:58 +02:00
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

View File

@@ -33,7 +33,7 @@ func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort
s.domain = domain
s.pathPrefix = pathPrefix
s.port = appPort
s.ttl = time.Second * 15
s.ttl = time.Second * 10
client, err := consul.NewClient(newClientConfig(servAddr))
if err != nil {
@@ -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 {
@@ -70,7 +70,7 @@ func (s *Service) Register() error {
Tags: s.getTags(),
Check: &consul.AgentServiceCheck{
TTL: s.ttl.String(),
DeregisterCriticalServiceAfter: "5s",
DeregisterCriticalServiceAfter: "10s",
},
}
@@ -79,7 +79,7 @@ func (s *Service) Register() error {
}
go func(s *Service) { // startup register
ticker := time.NewTicker(time.Millisecond * 100)
ticker := time.NewTicker(time.Second * 1)
for range ticker.C {
if ok, _ := s.healthCheck(); ok {
ticker.Stop()
@@ -87,15 +87,15 @@ func (s *Service) Register() error {
}
}(s)
go func(s *Service) { // TTL
interval := s.ttl - time.Second*2 // 2 seconds overhead
ticker := time.NewTicker(interval)
for range ticker.C {
if _, err := s.healthCheck(); err != nil {
fmt.Printf("TTL Error: %v\n", err)
}
}
}(s)
// go func(s *Service) { // TTL
// interval := s.ttl - time.Second*2 // 2 seconds overhead
// ticker := time.NewTicker(interval)
// for range ticker.C {
// if _, err := s.healthCheck(); err != nil {
// fmt.Printf("TTL Error #: %v\n", err)
// }
// }
// }(s)
return nil
}
@@ -154,7 +154,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",