unistack-org/micro-register-etcd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix build

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2022-01-27 11:33:07 +03:00
parent 8a4ed24b38
commit 1f98cccac3
2 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
etcd.go
View File

@ -23,7 +23,7 @@ import (
)
const (
Defaultprefix = "/micro/register/"
DefaultPrefix = "/micro/register/"
DefaultDomain = "micro"
)
@ -200,7 +200,7 @@ func serializeServiceName(s string) string {
}
func prefixWithDomain(domain string) string {
return path.Join(prefix, domain)
return path.Join(DefaultPrefix, domain)
}
func (e *etcdRegister) Init(opts ...register.Option) error {
@ -227,13 +227,7 @@ func (e *etcdRegister) registerNode(s *register.Service, node *register.Node, op
}
// parse the options
var options register.RegisterOptions
for _, o := range opts {
o(&options)
}
if len(options.Domain) == 0 {
options.Domain = defaultDomain
}
options := register.NewRegisterOptions(opts...)
if s.Metadata == nil {
s.Metadata = map[string]string{}
@ -402,13 +396,7 @@ func (e *etcdRegister) Deregister(ctx context.Context, s *register.Service, opts
}
// parse the options
var options register.DeregisterOptions
for _, o := range opts {
o(&options)
}
if len(options.Domain) == 0 {
options.Domain = defaultDomain
}
options := register.NewDeregisterOptions(opts...)
for _, node := range s.Nodes {
e.Lock()
@ -465,19 +453,13 @@ func (e *etcdRegister) LookupService(ctx context.Context, name string, opts ...r
defer cancel()
// parse the options and fallback to the default domain
var options register.LookupOptions
for _, o := range opts {
o(&options)
}
if len(options.Domain) == 0 {
options.Domain = defaultDomain
}
options := register.NewLookupOptions(opts...)
var results []*mvccpb.KeyValue
// TODO: refactorout wildcard, this is an incredibly expensive operation
if options.Domain == register.WildcardDomain {
rsp, err := e.client.Get(ctx, prefix, clientv3.WithPrefix(), clientv3.WithSerializable())
rsp, err := e.client.Get(ctx, DefaultPrefix, clientv3.WithPrefix(), clientv3.WithSerializable())
if err != nil {
return nil, err
}
@ -485,7 +467,7 @@ func (e *etcdRegister) LookupService(ctx context.Context, name string, opts ...r
// filter the results for the key we care about
for _, kv := range rsp.Kvs {
// if the key does not contain the name then pass
_, service, ok := getName(string(kv.Key), prefix)
_, service, ok := getName(string(kv.Key), DefaultPrefix)
if !ok || service != name {
continue
}
@ -510,7 +492,7 @@ func (e *etcdRegister) LookupService(ctx context.Context, name string, opts ...r
for _, n := range results {
// only process the things we care about
domain, service, ok := getName(string(n.Key), prefix)
domain, service, ok := getName(string(n.Key), DefaultPrefix)
if !ok || service != name {
continue
}
@ -545,22 +527,19 @@ func (e *etcdRegister) LookupService(ctx context.Context, name string, opts ...r
func (e *etcdRegister) ListServices(ctx context.Context, opts ...register.ListOption) ([]*register.Service, error) {
// parse the options
options := register.NewListOptions(opts...)
if len(options.Domain) == 0 {
options.Domain = defaultDomain
}
// determine the prefix
var p string
if options.Domain == register.WildcardDomain {
p = prefix
p = DefaultPrefix
} else {
p = prefixWithDomain(options.Domain)
}
ctx, cancel := context.WithTimeout(context.Background(), e.options.Timeout)
nctx, cancel := context.WithTimeout(context.Background(), e.options.Timeout)
defer cancel()
rsp, err := e.client.Get(ctx, p, clientv3.WithPrefix(), clientv3.WithSerializable())
rsp, err := e.client.Get(nctx, p, clientv3.WithPrefix(), clientv3.WithSerializable())
if err != nil {
return nil, err
}
@ -570,7 +549,7 @@ func (e *etcdRegister) ListServices(ctx context.Context, opts ...register.ListOp
versions := make(map[string]*register.Service)
for _, n := range rsp.Kvs {
domain, service, ok := getName(string(n.Key), prefix)
domain, service, ok := getName(string(n.Key), DefaultPrefix)
if !ok {
continue
}

12
watcher.go
View File

@ -21,20 +21,14 @@ type etcdWatcher struct {
}
func newEtcdWatcher(c *clientv3.Client, timeout time.Duration, opts ...register.WatchOption) (register.Watcher, error) {
var wo register.WatchOptions
for _, o := range opts {
o(&wo)
}
if len(wo.Domain) == 0 {
wo.Domain = defaultDomain
}
wo := register.NewWatchOptions(opts...)
watchPath := prefix
watchPath := DefaultPrefix
if wo.Domain == register.WildcardDomain {
if len(wo.Service) > 0 {
return nil, errors.New("Cannot watch a service across domains")
}
watchPath = prefix
watchPath = DefaultPrefix
} else if len(wo.Service) > 0 {
watchPath = servicePath(wo.Domain, wo.Service) + "/"
}