Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0aa79c7d35 | |||
| d484c0e3b0 | |||
| 7a35d1f44a | |||
| 7bfd048051 | |||
| 1433b69abe | |||
| c49ec85b3b |
@@ -33,7 +33,7 @@ func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort
|
|||||||
s.domain = domain
|
s.domain = domain
|
||||||
s.pathPrefix = pathPrefix
|
s.pathPrefix = pathPrefix
|
||||||
s.port = appPort
|
s.port = appPort
|
||||||
s.ttl = time.Second * 15
|
s.ttl = time.Second * 10
|
||||||
|
|
||||||
client, err := consul.NewClient(newClientConfig(servAddr))
|
client, err := consul.NewClient(newClientConfig(servAddr))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -54,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 {
|
||||||
@@ -70,7 +70,7 @@ func (s *Service) Register() error {
|
|||||||
Tags: s.getTags(),
|
Tags: s.getTags(),
|
||||||
Check: &consul.AgentServiceCheck{
|
Check: &consul.AgentServiceCheck{
|
||||||
TTL: s.ttl.String(),
|
TTL: s.ttl.String(),
|
||||||
DeregisterCriticalServiceAfter: "5s",
|
DeregisterCriticalServiceAfter: "10s",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,7 +79,7 @@ func (s *Service) Register() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
go func(s *Service) { // startup register
|
go func(s *Service) { // startup register
|
||||||
ticker := time.NewTicker(time.Millisecond * 100)
|
ticker := time.NewTicker(time.Second * 1)
|
||||||
for range ticker.C {
|
for range ticker.C {
|
||||||
if ok, _ := s.healthCheck(); ok {
|
if ok, _ := s.healthCheck(); ok {
|
||||||
ticker.Stop()
|
ticker.Stop()
|
||||||
@@ -87,15 +87,15 @@ func (s *Service) Register() error {
|
|||||||
}
|
}
|
||||||
}(s)
|
}(s)
|
||||||
|
|
||||||
go func(s *Service) { // TTL
|
// go func(s *Service) { // TTL
|
||||||
interval := s.ttl - time.Second*2 // 2 seconds overhead
|
// interval := s.ttl - time.Second*2 // 2 seconds overhead
|
||||||
ticker := time.NewTicker(interval)
|
// ticker := time.NewTicker(interval)
|
||||||
for range ticker.C {
|
// for range ticker.C {
|
||||||
if _, err := s.healthCheck(); err != nil {
|
// if _, err := s.healthCheck(); err != nil {
|
||||||
fmt.Printf("TTL Error: %v\n", err)
|
// fmt.Printf("TTL Error #: %v\n", err)
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}(s)
|
// }(s)
|
||||||
|
|
||||||
return nil
|
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.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=" + 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.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",
|
||||||
|
|||||||
Reference in New Issue
Block a user