consul registration update

consul/discovery.go

@@ -25,8 +25,8 @@ type Service struct {
 	connect    *connect.Service
 	kv         *consul.KV
 
-	hcTicker  *time.Ticker
+	// hcTicker  *time.Ticker
-	ttlTicker *time.Ticker
+	// ttlTicker *time.Ticker
 }
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
@@ -85,11 +85,13 @@ func (s *Service) Register() error {
 		Address: s.Address,
 		Port:    s.port,
 		Tags:    s.getTags(),
-		// Connect: &consul.AgentServiceConnect{Native: true},
+		Connect: &consul.AgentServiceConnect{Native: true},
 		// Proxy: &consul.AgentServiceConnectProxyConfig{
 		// 	DestinationServiceName: s.Name,
 		// },
 		Check: &consul.AgentServiceCheck{
+			// Interval:                       "5s",
+			// Timeout:                        "1s",
 			TTL:                            s.ttl.String(),
 			Status:                         "passing",
 			DeregisterCriticalServiceAfter: "10s",
@@ -142,11 +144,10 @@ func (s *Service) Connect() (*connect.Service, error) {
 	// })
 	svc, err := connect.NewService(s.Name, s.client)
 	s.connect = svc
-	cnf := svc.ServerTLSConfig()
+	fmt.Printf("CONNECT SERVER:: %s CERTS:: %v\n", s.Name, svc.ServerTLSConfig())
-	fmt.Printf("CONNECT SERVER:: %s CONFIG:: %v\n", s.Name, cnf)
+	// for k, c := range cnf.Certificates {
-	for k, c := range cnf.Certificates {
+	// 	fmt.Printf("CONNECT CERT %d: %v", k, c)
-		fmt.Printf("CONNECT CERT %d: %v", k, c)
+	// }
-	}
 
 	return svc, err
 }
@@ -203,8 +204,7 @@ func (s *Service) getTags() []string {
 		"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",
-		"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 + ".tls=true",
 		"traefik.http.routers." + s.Name + ".service=" + s.Name,
@@ -213,7 +213,7 @@ func (s *Service) getTags() []string {
 		"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.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.path=/health",
 		"traefik.tls.certificates.certfile=certs/client.crt",