diff --git a/config/base_config.go b/config/base_config.go
index e15b58f8bf5b48caf1f8f8cae7c22f52f573bb6a..c0992006da6ea1bc96dfa1ccb547b82cb6bd2598 100644
--- a/config/base_config.go
+++ b/config/base_config.go
@@ -69,7 +69,7 @@ func (c *BaseConfig) GetRemoteConfig(name string) (config *RemoteConfig, ok bool
return
}
-func (c *BaseConfig) newURL(name string, protocol string) (common.URL, error) {
+func (c *BaseConfig) toURL(name string, protocol string) (common.URL, error) {
rc, ok := GetBaseConfig().GetRemoteConfig(name)
if !ok {
diff --git a/config/base_config_test.go b/config/base_config_test.go
index 6db6a8dcb84de3fdefe94cce87338b9efe28246c..849a9c4586c0c8cd2d74e3dd1011aaab466f0e93 100644
--- a/config/base_config_test.go
+++ b/config/base_config_test.go
@@ -28,8 +28,6 @@ import (
import (
"github.com/apache/dubbo-go/common/config"
- "github.com/apache/dubbo-go/common/extension"
- "github.com/apache/dubbo-go/config_center"
_ "github.com/apache/dubbo-go/config_center/apollo"
)
@@ -282,23 +280,6 @@ func TestRefreshProvider(t *testing.T) {
assert.Equal(t, "20001", father.Protocols["jsonrpc1"].Port)
}
-func TestStartConfigCenter(t *testing.T) {
- extension.SetConfigCenterFactory("mock", func() config_center.DynamicConfigurationFactory {
- return &config_center.MockDynamicConfigurationFactory{}
- })
- c := &BaseConfig{ConfigCenterConfig: &ConfigCenterConfig{
- Protocol: "mock",
- Address: "172.0.0.1",
- Group: "dubbo",
- ConfigFile: "mockDubbo.properties",
- }}
- err := c.startConfigCenter()
- assert.NoError(t, err)
- b, v := config.GetEnvInstance().Configuration().Back().Value.(*config.InmemoryConfiguration).GetProperty("dubbo.application.organization")
- assert.True(t, b)
- assert.Equal(t, "ikurento.com", v)
-}
-
func TestInitializeStruct(t *testing.T) {
testConsumerConfig := &ConsumerConfig{}
tp := reflect.TypeOf(ConsumerConfig{})
diff --git a/config/config_center_config.go b/config/config_center_config.go
index cd0612afb6d5892ce604e03446bfb37fd923c6b8..a70415004c8ca194872db15c57b731dcce718fd1 100644
--- a/config/config_center_config.go
+++ b/config/config_center_config.go
@@ -89,11 +89,20 @@ func (c *ConfigCenterConfig) GetUrlMap() url.Values {
type configCenter struct {
}
+// toURL will compatible with baseConfig.ConfigCenterConfig.Address before 1.6.0
+// After 1.6.0 will not compatible, only baseConfig.ConfigCenterConfig.RemoteRef
+func (b *configCenter) toURL(baseConfig BaseConfig) (common.URL, error) {
+ if len(baseConfig.ConfigCenterConfig.Address) > 0 {
+ return common.NewURL(baseConfig.ConfigCenterConfig.Address,
+ common.WithProtocol(baseConfig.ConfigCenterConfig.Protocol), common.WithParams(baseConfig.ConfigCenterConfig.GetUrlMap()))
+ }
+ return baseConfig.toURL(baseConfig.ConfigCenterConfig.RemoteRef, baseConfig.ConfigCenterConfig.Protocol)
+}
+
// startConfigCenter will start the config center.
// it will prepare the environment
func (b *configCenter) startConfigCenter(baseConfig BaseConfig) error {
- url, err := common.NewURL(baseConfig.ConfigCenterConfig.Address,
- common.WithProtocol(baseConfig.ConfigCenterConfig.Protocol), common.WithParams(baseConfig.ConfigCenterConfig.GetUrlMap()))
+ url, err := b.toURL(baseConfig)
if err != nil {
return err
}
@@ -112,7 +121,7 @@ func (b *configCenter) prepareEnvironment(baseConfig BaseConfig, configCenterUrl
logger.Errorf("Get dynamic configuration error , error message is %v", err)
return perrors.WithStack(err)
}
- content, err := dynamicConfig.GetProperties(baseConfig.ConfigCenterConfig.ConfigFile, config_center.WithGroup(c.ConfigCenterConfig.Group))
+ content, err := dynamicConfig.GetProperties(baseConfig.ConfigCenterConfig.ConfigFile, config_center.WithGroup(baseConfig.ConfigCenterConfig.Group))
if err != nil {
logger.Errorf("Get config content in dynamic configuration error , error message is %v", err)
return perrors.WithStack(err)
diff --git a/config/config_center_config_test.go b/config/config_center_config_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..ae653181e99e6dc0f371948434c7b5b5fed18d3e
--- /dev/null
+++ b/config/config_center_config_test.go
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package config
+
+import (
+ "testing"
+)
+
+import (
+ "github.com/stretchr/testify/assert"
+)
+
+import (
+ "github.com/apache/dubbo-go/common/config"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/config_center"
+)
+
+func TestStartConfigCenter(t *testing.T) {
+ extension.SetConfigCenterFactory("mock", func() config_center.DynamicConfigurationFactory {
+ return &config_center.MockDynamicConfigurationFactory{}
+ })
+ baseConfig := &BaseConfig{ConfigCenterConfig: &ConfigCenterConfig{
+ Protocol: "mock",
+ Address: "172.0.0.1",
+ Group: "dubbo",
+ ConfigFile: "mockDubbo.properties",
+ }}
+
+ c := &configCenter{}
+ err := c.startConfigCenter(*baseConfig)
+ assert.NoError(t, err)
+ b, v := config.GetEnvInstance().Configuration().Back().Value.(*config.InmemoryConfiguration).GetProperty("dubbo.application.organization")
+ assert.True(t, b)
+ assert.Equal(t, "ikurento.com", v)
+}
diff --git a/config/consumer_config.go b/config/consumer_config.go
index d26709c97835f89ec265837b893808aa86dec16b..177531209225b7a4b25751352d9777c0d4ee260c 100644
--- a/config/consumer_config.go
+++ b/config/consumer_config.go
@@ -126,13 +126,6 @@ func ConsumerInit(confConFile string) error {
func configCenterRefreshConsumer() error {
//fresh it
var err error
- if consumerConfig.ConfigCenterConfig != nil {
- consumerConfig.SetFatherConfig(consumerConfig)
- if err = consumerConfig.startConfigCenter((*consumerConfig).BaseConfig); err != nil {
- return perrors.Errorf("start config center error , error message is {%v}", perrors.WithStack(err))
- }
- consumerConfig.fresh()
- }
if consumerConfig.Request_Timeout != "" {
if consumerConfig.RequestTimeout, err = time.ParseDuration(consumerConfig.Request_Timeout); err != nil {
return perrors.WithMessagef(err, "time.ParseDuration(Request_Timeout{%#v})", consumerConfig.Request_Timeout)
@@ -143,5 +136,12 @@ func configCenterRefreshConsumer() error {
return perrors.WithMessagef(err, "time.ParseDuration(Connect_Timeout{%#v})", consumerConfig.Connect_Timeout)
}
}
+ if consumerConfig.ConfigCenterConfig != nil {
+ consumerConfig.SetFatherConfig(consumerConfig)
+ if err = consumerConfig.startConfigCenter((*consumerConfig).BaseConfig); err != nil {
+ return perrors.Errorf("start config center error , error message is {%v}", perrors.WithStack(err))
+ }
+ consumerConfig.fresh()
+ }
return nil
}