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

Merge pull request #290 from micro/connect

Browse Source 
Support connect native registration
This commit is contained in:
Asim Aslam 2018-08-06 17:20:37 +01:00 committed by GitHub
commit 68f5e71153
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
registry/consul/options.go
View File

@ -8,6 +8,16 @@ import (
"github.com/micro/go-micro/registry" "github.com/micro/go-micro/registry"
) )
// Connect specifies services should be registered as Consul Connect services
func Connect() registry.Option {
return func(o *registry.Options) {
if o.Context == nil {
o.Context = context.Background()
}
o.Context = context.WithValue(o.Context, "consul_connect", true)
}
}
func Config(c *consul.Config) registry.Option { func Config(c *consul.Config) registry.Option {
return func(o *registry.Options) { return func(o *registry.Options) {
if o.Context == nil { if o.Context == nil {

32
registry/consul_registry.go
View File

@ -19,6 +19,9 @@ type consulRegistry struct {
Client *consul.Client Client *consul.Client
opts Options opts Options
// connect enabled
connect bool
sync.Mutex sync.Mutex
register map[string]uint64 register map[string]uint64
} }
@ -53,11 +56,16 @@ func newConsulRegistry(opts ...Option) Registry {
// use default config // use default config
config := consul.DefaultConfig() config := consul.DefaultConfig()
connect := false
if options.Context != nil { if options.Context != nil {
// Use the consul config passed in the options, if available // Use the consul config passed in the options, if available
if c, ok := options.Context.Value("consul_config").(*consul.Config); ok { if c, ok := options.Context.Value("consul_config").(*consul.Config); ok {
config = c config = c
} }
if cn, ok := options.Context.Value("consul_connect").(bool); ok {
connect = cn
}
} }
// check if there are any addrs // check if there are any addrs
@ -96,6 +104,7 @@ func newConsulRegistry(opts ...Option) Registry {
Client: client, Client: client,
opts: options, opts: options,
register: make(map[string]uint64), register: make(map[string]uint64),
connect: connect,
} }
return cr return cr
@ -198,14 +207,23 @@ func (c *consulRegistry) Register(s *Service, opts ...RegisterOption) error {
} }
// register the service // register the service
if err := c.Client.Agent().ServiceRegister(&consul.AgentServiceRegistration{ asr := &consul.AgentServiceRegistration{
ID: node.Id, ID: node.Id,
Name: s.Name, Name: s.Name,
Tags: tags, Tags: tags,
Port: node.Port, Port: node.Port,
Address: node.Address, Address: node.Address,
Check: check, Check: check,
}); err != nil { }
// Specify consul connect
if c.connect {
asr.Connect = &consul.AgentServiceConnect{
Native: true,
}
}
if err := c.Client.Agent().ServiceRegister(asr); err != nil {
return err return err
} }
@ -224,7 +242,15 @@ func (c *consulRegistry) Register(s *Service, opts ...RegisterOption) error {
} }
func (c *consulRegistry) GetService(name string) ([]*Service, error) { func (c *consulRegistry) GetService(name string) ([]*Service, error) {
rsp, _, err := c.Client.Health().Service(name, "", false, nil) var rsp []*consul.ServiceEntry
var err error
// if we're connect enabled only get connect services
if c.connect {
rsp, _, err = c.Client.Health().Connect(name, "", false, nil)
} else {
rsp, _, err = c.Client.Health().Service(name, "", false, nil)
}
if err != nil { if err != nil {
return nil, err return nil, err
} }