Compare commits

...

6 Commits

Author SHA1 Message Date
c64bc3fe6b consul fixes 2023-07-08 17:16:53 +02:00
016bddb5c4 register fix 2 2023-07-08 17:11:53 +02:00
98d85810f3 register fix 2 2023-07-08 13:02:13 +02:00
3fc1191f6e register fix 2 2023-07-08 02:22:28 +02:00
52793ac244 register fix 2 2023-07-06 23:02:05 +02:00
f8a1ae841d register fix 2 2023-07-06 21:49:12 +02:00

View File

@@ -61,7 +61,7 @@ func (s *Service) GetID() string {
} }
func (s *Service) GetFullAddr() string { func (s *Service) GetFullAddr() string {
return fmt.Sprintf("http://%s:%d/", s.domain, s.port) return fmt.Sprintf("https://%s:%d/", s.domain, s.port)
} }
func (s *Service) Register() error { func (s *Service) Register() error {
@@ -73,13 +73,14 @@ func (s *Service) Register() error {
Port: s.port, Port: s.port,
Tags: s.getTags(), Tags: s.getTags(),
Connect: &consul.AgentServiceConnect{ Connect: &consul.AgentServiceConnect{
SidecarService: &consul.AgentServiceRegistration{ Native: true,
// SidecarService: &consul.AgentServiceRegistration{
// Port: s.port, // Port: s.port,
// },
}, },
}, // Proxy: &consul.AgentServiceConnectProxyConfig{
Proxy: &consul.AgentServiceConnectProxyConfig{ // DestinationServiceName: s.Name,
DestinationServiceName: s.Name, // },
},
Check: &consul.AgentServiceCheck{ Check: &consul.AgentServiceCheck{
TTL: s.ttl.String(), TTL: s.ttl.String(),
Status: "passing", Status: "passing",
@@ -91,16 +92,23 @@ func (s *Service) Register() error {
return err return err
} }
go func(s *Service) { // startup register return nil
}
func (s *Service) Unregister() error {
return s.agent.ServiceDeregister(s.GetID())
}
func (s *Service) InitCheclChecks() {
go func() { // startup register
ticker := time.NewTicker(time.Second * 1) 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()
} }
} }
}(s) }()
go func(s *Service) { // TTL go func() { // 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 {
@@ -108,12 +116,7 @@ func (s *Service) Register() error {
fmt.Printf("TTL Error #: %v\n", err) fmt.Printf("TTL Error #: %v\n", err)
} }
} }
}(s) }()
return nil
}
func (s *Service) Unregister() error {
return s.agent.ServiceDeregister(s.GetID())
} }
func (s *Service) Connect() (*connect.Service, error) { func (s *Service) Connect() (*connect.Service, error) {