Compare commits

..

5 Commits

Author SHA1 Message Date
599eaa3712 consul fixes 2023-07-29 13:47:51 +02:00
1de38fdfdf consul fixes 2023-07-26 23:19:17 +02:00
4d1f3644b0 consul fixes 2023-07-26 23:14:25 +02:00
71b3f13284 consul fixes 2023-07-08 17:18:19 +02:00
c64bc3fe6b consul fixes 2023-07-08 17:16:53 +02:00

View File

@@ -9,6 +9,7 @@ import (
"git.pbiernat.dev/egommerce/go-api-pkg/config" "git.pbiernat.dev/egommerce/go-api-pkg/config"
consul "github.com/hashicorp/consul/api" consul "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/connect" "github.com/hashicorp/consul/connect"
"github.com/hashicorp/go-hclog"
) )
type Service struct { type Service struct {
@@ -74,9 +75,6 @@ func (s *Service) Register() error {
Tags: s.getTags(), Tags: s.getTags(),
Connect: &consul.AgentServiceConnect{ Connect: &consul.AgentServiceConnect{
Native: true, Native: true,
// SidecarService: &consul.AgentServiceRegistration{
// Port: s.port,
// },
}, },
// Proxy: &consul.AgentServiceConnectProxyConfig{ // Proxy: &consul.AgentServiceConnectProxyConfig{
// DestinationServiceName: s.Name, // DestinationServiceName: s.Name,
@@ -98,7 +96,7 @@ func (s *Service) Unregister() error {
return s.agent.ServiceDeregister(s.GetID()) return s.agent.ServiceDeregister(s.GetID())
} }
func (s *Service) InitTTL() { func (s *Service) RegisterHealthChecks() {
go func() { // startup register go func() { // startup register
ticker := time.NewTicker(time.Second * 1) ticker := time.NewTicker(time.Second * 1)
for range ticker.C { for range ticker.C {
@@ -120,12 +118,14 @@ func (s *Service) InitTTL() {
} }
func (s *Service) Connect() (*connect.Service, error) { func (s *Service) Connect() (*connect.Service, error) {
// srvName := s.Name l := hclog.New(&hclog.LoggerOptions{
srvName := s.Name Name: "consul-registry",
svc, err := connect.NewService(srvName, s.client) Level: hclog.Trace,
})
svc, err := connect.NewServiceWithLogger(s.Name, s.client, l)
s.connect = svc s.connect = svc
cnf := svc.ServerTLSConfig() cnf := svc.ServerTLSConfig()
fmt.Printf("CONNECT SERVER:: %s CONFIG:: %v\n", srvName, cnf) 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)
} }