Compare commits

...

7 Commits
v0.1.5 ... rm

Author SHA1 Message Date
a37f6209ff Consul debug 2023-06-28 23:34:45 +02:00
fc88125fe4 Consul debug 2023-06-28 23:22:15 +02:00
0aa79c7d35 Consul debug and clean 2023-06-28 23:07:10 +02:00
d484c0e3b0 Consul debug 2023-06-28 22:59:31 +02:00
7a35d1f44a Consul debug 2023-06-28 22:54:58 +02:00
7bfd048051 Consul debug 2023-06-28 22:50:16 +02:00
1433b69abe Moar HR 2023-06-28 16:37:18 +02:00

View File

@@ -33,7 +33,7 @@ func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort
s.domain = domain
s.pathPrefix = pathPrefix
s.port = appPort
s.ttl = time.Second * 15
s.ttl = time.Second * 10
client, err := consul.NewClient(newClientConfig(servAddr))
if err != nil {
@@ -54,7 +54,7 @@ func newClientConfig(serverAddr string) *consul.Config {
}
func (s *Service) GetID() string {
return fmt.Sprintf("%s_%s", s.Name, s.appID)
return fmt.Sprintf("%s:%s", s.Name, s.appID)
}
func (s *Service) GetFullAddr() string {
@@ -70,7 +70,7 @@ func (s *Service) Register() error {
Tags: s.getTags(),
Check: &consul.AgentServiceCheck{
TTL: s.ttl.String(),
DeregisterCriticalServiceAfter: "5s",
DeregisterCriticalServiceAfter: "10s",
},
}
@@ -79,7 +79,7 @@ func (s *Service) Register() error {
}
go func(s *Service) { // startup register
ticker := time.NewTicker(time.Millisecond * 100)
ticker := time.NewTicker(time.Second * 1)
for range ticker.C {
if ok, _ := s.healthCheck(); ok {
ticker.Stop()
@@ -92,7 +92,7 @@ func (s *Service) Register() error {
ticker := time.NewTicker(interval)
for range ticker.C {
if _, err := s.healthCheck(); err != nil {
fmt.Printf("TTL Error: %v\n", err)
fmt.Printf("TTL Error #: %v\n", err)
}
}
}(s)
@@ -119,7 +119,7 @@ func (s *Service) healthCheck() (bool, error) {
if err != nil {
return false
}
req.Header.Set("User-Agent", "Health Check")
req.Header.Set("User-Agent", "service/internal")
resp, err := client.Do(req)
if err != nil {
@@ -132,6 +132,7 @@ func (s *Service) healthCheck() (bool, error) {
if alive {
if err := s.agent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
fmt.Printf("Failed to pass TTL: %v", err)
return false, err
}
return true, nil