fix dubbogoproxy config (apache#510)

bobtthp · Oct 30, 2022 · d4ef9ab · d4ef9ab
1 parent 6f61560
commit d4ef9ab
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/pixiu/pkg/client/dubbo/dubbo.go b/pixiu/pkg/client/dubbo/dubbo.go
@@ -132,20 +132,22 @@ func (dc *Client) SetConfig(dpc *DubboProxyConfig) {
 func (dc *Client) Apply() error {
 
 	rootConfigBuilder := dg.NewRootConfigBuilder()
-	for k, v := range dc.dubboProxyConfig.Registries {
-		if len(v.Protocol) == 0 {
-			logger.Warnf("can not find registry protocol config, use default type 'zookeeper'")
-			v.Protocol = defaultDubboProtocol
+	if dc.dubboProxyConfig != nil && dc.dubboProxyConfig.Registries != nil {
+		for k, v := range dc.dubboProxyConfig.Registries {
+			if len(v.Protocol) == 0 {
+				logger.Warnf("can not find registry protocol config, use default type 'zookeeper'")
+				v.Protocol = defaultDubboProtocol
+			}
+			rootConfigBuilder.AddRegistry(k, &dg.RegistryConfig{
+				Protocol:  v.Protocol,
+				Address:   v.Address,
+				Timeout:   v.Timeout,
+				Username:  v.Username,
+				Password:  v.Password,
+				Namespace: v.Namespace,
+				Group:     v.Group,
+			})
 		}
-		rootConfigBuilder.AddRegistry(k, &dg.RegistryConfig{
-			Protocol:  v.Protocol,
-			Address:   v.Address,
-			Timeout:   v.Timeout,
-			Username:  v.Username,
-			Password:  v.Password,
-			Namespace: v.Namespace,
-			Group:     v.Group,
-		})
 	}
 	rootConfigBuilder.SetApplication(defaultApplication)
 	rootConfig := rootConfigBuilder.Build()

diff --git a/pixiu/pkg/client/dubbo/dubbo_test.go b/pixiu/pkg/client/dubbo/dubbo_test.go
@@ -239,3 +239,9 @@ func TestBuildOption(t *testing.T) {
 	_, ok := option.(*interfaceOpt)
 	assert.True(t, ok)
 }
+
+func TestApply(t *testing.T) {
+	dClient := NewDubboClient()
+	err := dClient.Apply()
+	assert.Nil(t, err)
+}