Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 90e832af61 | |||
| 3d8c706835 | |||
| a37f6209ff | |||
| fc88125fe4 | |||
| 0aa79c7d35 | |||
| d484c0e3b0 | |||
| 7a35d1f44a | |||
| 7bfd048051 | |||
| 1433b69abe |
@@ -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)
|
||||
@@ -117,21 +117,25 @@ func (s *Service) healthCheck() (bool, error) {
|
||||
healthUrl := s.GetFullAddr() + "health"
|
||||
req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
|
||||
if err != nil {
|
||||
fmt.Printf("CreateRequest error: %v\n", err)
|
||||
return false
|
||||
}
|
||||
req.Header.Set("User-Agent", "Health Check")
|
||||
req.Header.Set("User-Agent", "service/internal")
|
||||
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
fmt.Printf("SendRequest error: %v\n", err)
|
||||
return false
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
fmt.Printf("ResponseCODE: %v\n", resp.StatusCode)
|
||||
return resp.StatusCode == http.StatusOK
|
||||
}()
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user