From e81bf83a98df1e84799652d2c266fc2c86af78a7 Mon Sep 17 00:00:00 2001 From: foghost Date: Mon, 23 Sep 2024 18:45:53 +0800 Subject: [PATCH] add check for registry type --- .../dubboregistry/registry/nacos/registry.go | 14 +++++++++----- .../dubboregistry/registry/zookeeper/registry.go | 2 ++ pkg/model/cluster.go | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkg/adapter/dubboregistry/registry/nacos/registry.go b/pkg/adapter/dubboregistry/registry/nacos/registry.go index 5ef48a8c8..72eb15f4b 100644 --- a/pkg/adapter/dubboregistry/registry/nacos/registry.go +++ b/pkg/adapter/dubboregistry/registry/nacos/registry.go @@ -92,9 +92,13 @@ func newNacosRegistry(regConfig model.Registry, adapterListener common.RegistryE nacosListeners: make(map[registry.RegisteredType]registry.Listener), } nacosRegistry.BaseRegistry = baseRegistry.NewBaseRegistry(nacosRegistry, adapterListener, registry.RegisterTypeFromName(regConfig.RegistryType)) - nacosRegistry.nacosListeners[nacosRegistry.RegisteredType] = newNacosIntfListener(client, nacosRegistry, ®Config, adapterListener) - - baseReg := baseRegistry.NewBaseRegistry(nacosRegistry, adapterListener, registry.RegisterTypeFromName(regConfig.RegistryType)) - nacosRegistry.BaseRegistry = baseReg - return baseReg, nil + switch nacosRegistry.RegisteredType { + case registry.RegisteredTypeInterface: + nacosRegistry.nacosListeners[nacosRegistry.RegisteredType] = newNacosIntfListener(client, nacosRegistry, ®Config, adapterListener) + //case registry.RegisteredTypeApplication: + //nacosRegistry.nacosListeners[nacosRegistry.RegisteredType] = newZkAppListener(zkReg.client, zkReg, zkReg.AdapterListener) + default: + return nil, errors.Errorf("Unsupported registry type: %s", regConfig.RegistryType) + } + return nacosRegistry, nil } diff --git a/pkg/adapter/dubboregistry/registry/zookeeper/registry.go b/pkg/adapter/dubboregistry/registry/zookeeper/registry.go index 67f11e4bb..d7ad96ba5 100644 --- a/pkg/adapter/dubboregistry/registry/zookeeper/registry.go +++ b/pkg/adapter/dubboregistry/registry/zookeeper/registry.go @@ -84,6 +84,8 @@ func newZKRegistry(regConfig model.Registry, adapterListener common.RegistryEven zkReg.zkListeners[zkReg.RegisteredType] = newZKIntfListener(zkReg.client, zkReg, zkReg.AdapterListener) case registry.RegisteredTypeApplication: zkReg.zkListeners[zkReg.RegisteredType] = newZkAppListener(zkReg.client, zkReg, zkReg.AdapterListener) + default: + return nil, errors.Errorf("Unsupported registry type: %s", regConfig.RegistryType) } return zkReg, nil } diff --git a/pkg/model/cluster.go b/pkg/model/cluster.go index a16e699e2..4fd66ba9f 100644 --- a/pkg/model/cluster.go +++ b/pkg/model/cluster.go @@ -81,7 +81,7 @@ type ( Password string `yaml:"password" json:"password"` Group string `default:"DEFAULT_GROUP" yaml:"group" json:"group"` Namespace string `yaml:"namespace" json:"namespace"` - RegistryType string `yaml:"registry_type" json:"registry_type"` // "application", "interface" + RegistryType string `default:"interface" yaml:"registry_type" json:"registry_type"` // "application", "interface" } // DiscoveryType