Compare commits

...

6 Commits

2 changed files with 10 additions and 11 deletions

View File

@@ -80,19 +80,17 @@ func (s *Service) Register() error {
go func(s *Service) { // startup register
ticker := time.NewTicker(time.Millisecond * 100)
for range ticker.C {
ok, _ := s.healthCheck()
if ok {
if ok, _ := s.healthCheck(); ok {
ticker.Stop()
}
}
}(s)
go func(s *Service) { // TTL
interval := s.ttl - time.Second*2
interval := s.ttl - time.Second*2 // 2 seconds overhead
ticker := time.NewTicker(interval)
for range ticker.C {
_, err := s.healthCheck()
if err != nil {
if _, err := s.healthCheck(); err != nil {
fmt.Printf("TTL Error: %v\n", err)
}
}
@@ -151,14 +149,15 @@ func (s *Service) getTags() []string {
"traefik.http.routers." + s.Name + ".entryPoints=https",
"traefik.http.routers." + s.Name + ".tls=true",
"traefik.http.routers." + s.Name + ".service=" + s.Name,
"traefik.http.routers." + s.Name + ".middlewares=auth,requestid,stripprefix_" + s.Name,
"traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",requestid_" + s.Name + ",stripprefix_" + s.Name,
"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.forwardauth.address=http://identity-svc/api/v1/traefik",
"traefik.http.middlewares.auth.forwardauth.authResponseHeaders=Set-Cookie, Server",
"traefik.http.middlewares.auth.forwardauth.trustForwardHeader=true",
"traefik.http.middlewares.requestid.plugin.requestid.headerName=X-Request-ID",
"traefik.http.middlewares.auth_" + s.Name + ".auth.handlerURL=http://identity-svc/api/v1/traefik",
// "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",
"traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
"traefik.tls.certificates.certfile=/certs/client.cert",
"traefik.tls.certificates.keyfile=/certs/client.key",

View File

@@ -10,7 +10,7 @@ func ParseAddr(addr string) (string, int, error) {
fHost := p[0]
fPort, err := strconv.Atoi(p[1])
if err != nil {
return nil, nil, err
return "", 0, err
}
return fHost, fPort, nil