Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e55a2f42fe | |||
| 82d68e91b8 | |||
| 767eb5688c | |||
| 37fa05402e | |||
| 615281ae9a | |||
| 42532b1d44 | |||
| 1d4164711e | |||
| a50778380e |
@@ -23,6 +23,9 @@ type Service struct {
|
||||
agent *consul.Agent
|
||||
connect *connect.Service
|
||||
kv *consul.KV
|
||||
|
||||
hcTicker *time.Ticker
|
||||
ttlTicker *time.Ticker
|
||||
}
|
||||
|
||||
var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
|
||||
@@ -99,30 +102,33 @@ func (s *Service) Register() error {
|
||||
return nil
|
||||
}
|
||||
func (s *Service) Unregister() error {
|
||||
// s.client.Catalog().Deregister(&consul.CatalogDeregistration{
|
||||
// Address: s.Address,
|
||||
// ServiceID: s.GetID(),
|
||||
// }, nil)
|
||||
s.ttlTicker.Stop()
|
||||
// s.hcTicker.Stop()
|
||||
|
||||
s.client.Catalog().Deregister(&consul.CatalogDeregistration{
|
||||
Address: s.Address,
|
||||
ServiceID: s.GetID(),
|
||||
}, nil)
|
||||
|
||||
return s.agent.ServiceDeregister(s.GetID())
|
||||
}
|
||||
|
||||
func (s *Service) RegisterHealthChecks() {
|
||||
go func() { // startup register
|
||||
ticker := time.NewTicker(time.Second * 1)
|
||||
for range ticker.C {
|
||||
s.hcTicker = time.NewTicker(time.Second)
|
||||
for range s.hcTicker.C {
|
||||
if ok, _ := s.healthCheck(); ok {
|
||||
ticker.Stop()
|
||||
s.hcTicker.Stop()
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
go func() { // TTL
|
||||
interval := s.ttl - (time.Second * 2) // 2 seconds overhead
|
||||
ticker := time.NewTicker(interval)
|
||||
for range ticker.C {
|
||||
s.ttlTicker = time.NewTicker(s.ttl)
|
||||
for range s.ttlTicker.C {
|
||||
if _, err := s.healthCheck(); err != nil {
|
||||
fmt.Printf("HealthCheck endpoint not available (%s)#: %v\n", s.GetFullAddr(), err)
|
||||
// s.ttlTicker.Stop()
|
||||
}
|
||||
}
|
||||
}()
|
||||
@@ -193,15 +199,15 @@ func (s *Service) getTags() []string {
|
||||
"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", "http://identity.service.ego.io/api/v1/traefik"),
|
||||
"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
|
||||
"traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
|
||||
"treafik.http.middlewares.retryif_" + s.Name + ".plugin.retryif.attempts: 3",
|
||||
"treafik.http.middlewares.retryif_" + s.Name + ".plugin.retryif.statusCode: 503",
|
||||
// "treafik.http.middlewares.retryif_" + s.Name + ".plugin.retryif.attempts=3",
|
||||
// "treafik.http.middlewares.retryif_" + s.Name + ".plugin.retryif.statusCode=503",
|
||||
"traefik.http.routers." + s.Name + ".rule=PathPrefix(`" + s.pathPrefix + "`)",
|
||||
// "traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`)",
|
||||
"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_" + s.Name + ",stripprefix_" + s.Name,
|
||||
"traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",requestid_" + s.Name + ",stripprefix_" + s.Name + "",
|
||||
"traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",stripprefix_" + s.Name + ",requestid_" + 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=true",
|
||||
|
||||
Reference in New Issue
Block a user