Compare commits

...

7 Commits

Author SHA1 Message Date
7725e5dd65 debug fix 2024-07-20 20:12:29 +02:00
07c0cd6f2e debug fix 2024-07-20 19:59:12 +02:00
d29bd0810b debug fix 2024-07-20 19:55:33 +02:00
b62c0e5a8c debug fix 2024-07-20 19:03:21 +02:00
a9eb0d0732 debug fix 2024-07-20 18:19:56 +02:00
92b84685c9 routing fix 2024-07-20 17:30:37 +02:00
cd6e62e3bc debug fix 2024-07-20 16:17:13 +02:00

View File

@@ -25,8 +25,8 @@ type Service struct {
connect *connect.Service connect *connect.Service
kv *consul.KV kv *consul.KV
hcTicker *time.Ticker // hcTicker *time.Ticker
ttlTicker *time.Ticker // ttlTicker *time.Ticker
} }
var ErrServiceUnavailable = fmt.Errorf("Service is unavailable") var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
@@ -90,6 +90,8 @@ func (s *Service) Register() error {
// DestinationServiceName: s.Name, // DestinationServiceName: s.Name,
// }, // },
Check: &consul.AgentServiceCheck{ Check: &consul.AgentServiceCheck{
// Interval: "5s",
// Timeout: "1s",
TTL: s.ttl.String(), TTL: s.ttl.String(),
Status: "passing", Status: "passing",
DeregisterCriticalServiceAfter: "10s", DeregisterCriticalServiceAfter: "10s",
@@ -203,8 +205,7 @@ func (s *Service) getTags() []string {
"traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID", "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.attempts=3",
// "treafik.http.middlewares.retryif_" + s.Name + ".plugin.retryif.statusCode=503", // "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 + "`) && PathPrefix(`" + s.pathPrefix + "`)",
"traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`)",
"traefik.http.routers." + s.Name + ".entryPoints=https", "traefik.http.routers." + s.Name + ".entryPoints=https",
"traefik.http.routers." + s.Name + ".tls=true", "traefik.http.routers." + s.Name + ".tls=true",
"traefik.http.routers." + s.Name + ".service=" + s.Name, "traefik.http.routers." + s.Name + ".service=" + s.Name,
@@ -213,7 +214,7 @@ func (s *Service) getTags() []string {
"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=https", "traefik.http.services." + s.Name + ".loadbalancer.server.scheme=https",
"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=true", "traefik.http.services." + s.Name + ".loadbalancer.passhostheader=true",
"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.interval=2s", "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.interval=5s",
"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.timeout=1s", "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.timeout=1s",
"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health", "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health",
"traefik.tls.certificates.certfile=certs/client.crt", "traefik.tls.certificates.certfile=certs/client.crt",