Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 71b3f13284 | |||
| c64bc3fe6b | |||
| 016bddb5c4 | |||
| 98d85810f3 | |||
| 3fc1191f6e | |||
| 52793ac244 | |||
| f8a1ae841d |
@@ -61,7 +61,7 @@ func (s *Service) GetID() 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 {
|
||||
@@ -73,13 +73,14 @@ func (s *Service) Register() error {
|
||||
Port: s.port,
|
||||
Tags: s.getTags(),
|
||||
Connect: &consul.AgentServiceConnect{
|
||||
SidecarService: &consul.AgentServiceRegistration{
|
||||
// Port: s.port,
|
||||
},
|
||||
},
|
||||
Proxy: &consul.AgentServiceConnectProxyConfig{
|
||||
DestinationServiceName: s.Name,
|
||||
Native: true,
|
||||
// SidecarService: &consul.AgentServiceRegistration{
|
||||
// Port: s.port,
|
||||
// },
|
||||
},
|
||||
// Proxy: &consul.AgentServiceConnectProxyConfig{
|
||||
// DestinationServiceName: s.Name,
|
||||
// },
|
||||
Check: &consul.AgentServiceCheck{
|
||||
TTL: s.ttl.String(),
|
||||
Status: "passing",
|
||||
@@ -91,16 +92,23 @@ func (s *Service) Register() error {
|
||||
return err
|
||||
}
|
||||
|
||||
go func(s *Service) { // startup register
|
||||
return nil
|
||||
}
|
||||
func (s *Service) Unregister() error {
|
||||
return s.agent.ServiceDeregister(s.GetID())
|
||||
}
|
||||
|
||||
func (s *Service) InitHealthChecks() {
|
||||
go func() { // startup register
|
||||
ticker := time.NewTicker(time.Second * 1)
|
||||
for range ticker.C {
|
||||
if ok, _ := s.healthCheck(); ok {
|
||||
ticker.Stop()
|
||||
}
|
||||
}
|
||||
}(s)
|
||||
}()
|
||||
|
||||
go func(s *Service) { // TTL
|
||||
go func() { // TTL
|
||||
interval := s.ttl - time.Second*2 // 2 seconds overhead
|
||||
ticker := time.NewTicker(interval)
|
||||
for range ticker.C {
|
||||
@@ -108,12 +116,7 @@ func (s *Service) Register() error {
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user