add check for registry type

apache · Sep 23, 2024 · e81bf83 · e81bf83
1 parent fb700a9
commit e81bf83
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git 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, &regConfig, 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, &regConfig, 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
@@ -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
@@ -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