fix: distinguish between go-micro and ocis connections to registry
This commit is contained in:
committed by
Jörn Friedrich Dreyer
parent
c0b4a5daa0
commit
f035f3ce6e
@@ -30,7 +30,15 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
cmd.DefaultRegistries[_registryName] = NewRegistry
|
cmd.DefaultRegistries[_registryName] = NewRegistryMicro
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewRegistryMicro returns a new natsjs registry, forcing the service name
|
||||||
|
// to be "_go-micro". This is the registry that is intended to be used by
|
||||||
|
// go-micro
|
||||||
|
func NewRegistryMicro(opts ...registry.Option) registry.Registry {
|
||||||
|
overwrittenOpts := append(opts, ServiceName("_go-micro"))
|
||||||
|
return NewRegistry(overwrittenOpts...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewRegistry returns a new natsjs registry
|
// NewRegistry returns a new natsjs registry
|
||||||
@@ -187,7 +195,7 @@ func (n *storeregistry) storeOptions(opts registry.Options) []store.Option {
|
|||||||
storeoptions = append(storeoptions, natsjskv.DefaultTTL(defaultTTL))
|
storeoptions = append(storeoptions, natsjskv.DefaultTTL(defaultTTL))
|
||||||
}
|
}
|
||||||
|
|
||||||
serviceName := "_oc" // use "_oc" as default service name if nothing else is provided
|
serviceName := "_unknown" // use "_unknown" as default service name if nothing else is provided
|
||||||
if name, ok := opts.Context.Value(serviceNameKey{}).(string); ok {
|
if name, ok := opts.Context.Value(serviceNameKey{}).(string); ok {
|
||||||
serviceName = name
|
serviceName = name
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ func GetRegistry(opts ...Option) mRegistry.Registry {
|
|||||||
_reg = natsjsregistry.NewRegistry(
|
_reg = natsjsregistry.NewRegistry(
|
||||||
mRegistry.Addrs(cfg.Addresses...),
|
mRegistry.Addrs(cfg.Addresses...),
|
||||||
natsjsregistry.DefaultTTL(cfg.RegisterTTL),
|
natsjsregistry.DefaultTTL(cfg.RegisterTTL),
|
||||||
|
natsjsregistry.ServiceName("_oc"),
|
||||||
)
|
)
|
||||||
case "memory":
|
case "memory":
|
||||||
_reg = memr.NewRegistry()
|
_reg = memr.NewRegistry()
|
||||||
|
|||||||
Reference in New Issue
Block a user