unistack-org/micro
4
0
Fork 3
Code Issues 17 Pull Requests 1 Actions Packages Projects Releases 258 Wiki Activity

Merge pull request #313 from lovelly/master

Browse Source 
Fix tcp check no ttl error
This commit is contained in:
Asim Aslam 2018-11-03 12:16:56 +00:00 committed by GitHub
commit c8a35afc92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
registry/consul_registry.go
View File

@ -180,12 +180,23 @@ func (c *consulRegistry) Register(s *Service, opts ...RegisterOption) error {
// if it's already registered and matches then just pass the check // if it's already registered and matches then just pass the check
if ok && v == h { if ok && v == h {
if options.TTL == time.Duration(0) {
services,_, err := c.Client.Health().Checks(s.Name, nil)
if err == nil {
for _, v := range services {
if v.ServiceID == node.Id {
return nil
}
}
}
}else{
// if the err is nil we're all good, bail out // if the err is nil we're all good, bail out
// if not, we don't know what the state is, so full re-register // if not, we don't know what the state is, so full re-register
if err := c.Client.Agent().PassTTL("service:"+node.Id, ""); err == nil { if err := c.Client.Agent().PassTTL("service:"+node.Id, ""); err == nil {
return nil return nil
} }
} }
}
// encode the tags // encode the tags
tags := encodeMetadata(node.Metadata) tags := encodeMetadata(node.Metadata)