You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by GitBox <gi...@apache.org> on 2020/08/02 14:46:27 UTC
[GitHub] [dubbo-go] zouyx opened a new pull request #687: Rft: Optimize remotes configuration
zouyx opened a new pull request #687:
URL: https://github.com/apache/dubbo-go/pull/687
<!-- Thanks for sending a pull request!
-->
**What this PR does**:
* optimize remotes configuration
* refactor config center implement.
**Which issue(s) this PR fixes**:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
-->
Fixes #501
**Special notes for your reviewer**:
**Does this PR introduce a user-facing change?**:
<!--
If no, just write "NONE" in the release-note block below.
If yes, a release note is required:
Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
-->
```release-note
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go] zouyx commented on a change in pull request #687: Rft: Optimize remotes configuration
Posted by GitBox <gi...@apache.org>.
zouyx commented on a change in pull request #687:
URL: https://github.com/apache/dubbo-go/pull/687#discussion_r465828078
##########
File path: config/config_center_config_test.go
##########
@@ -0,0 +1,95 @@
+/*
+ * 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)
+}
+
+func TestStartConfigCenterWithRemoteRef(t *testing.T) {
+ extension.SetConfigCenterFactory("mock", func() config_center.DynamicConfigurationFactory {
+ return &config_center.MockDynamicConfigurationFactory{}
+ })
+ m := make(map[string]*RemoteConfig)
+ m["mock"] = &RemoteConfig{Protocol: "mock", Address: "172.0.0.1"}
+ baseConfig = &BaseConfig{
+ Remotes: m,
+ ConfigCenterConfig: &ConfigCenterConfig{
+ Group: "dubbo",
+ RemoteRef: "mock",
+ 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)
+
+ baseConfig = nil
Review comment:
maybe .... This `baseconfig` scope is in this test file, i just think clear it before next test.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go] gaoxinge commented on a change in pull request #687: Rft: Optimize remotes configuration
Posted by GitBox <gi...@apache.org>.
gaoxinge commented on a change in pull request #687:
URL: https://github.com/apache/dubbo-go/pull/687#discussion_r465803601
##########
File path: config/config_center_config.go
##########
@@ -77,3 +85,94 @@ func (c *ConfigCenterConfig) GetUrlMap() url.Values {
urlMap.Set(constant.CONFIG_LOG_DIR_KEY, c.LogDir)
return urlMap
}
+
+type configCenter struct {
+}
+
+// toURL will compatible with baseConfig.ConfigCenterConfig.Address and baseConfig.ConfigCenterConfig.RemoteRef 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()))
+ }
+
+ remoteRef := baseConfig.ConfigCenterConfig.RemoteRef
+ rc, ok := GetBaseConfig().GetRemoteConfig(remoteRef)
+
+ if !ok {
+ return common.URL{}, perrors.New("Could not find out the remote ref config, name: " + remoteRef)
+ }
+
+ newURL, err := rc.toURL()
+ if err == nil {
+ newURL.SetParams(baseConfig.ConfigCenterConfig.GetUrlMap())
+ }
+ return newURL, err
+}
+
+// startConfigCenter will start the config center.
+// it will prepare the environment
+func (b *configCenter) startConfigCenter(baseConfig BaseConfig) error {
+ url, err := b.toURL(baseConfig)
+ if err != nil {
+ return err
+ }
+ if b.prepareEnvironment(baseConfig, &url) != nil {
Review comment:
Why not `err = b.prepareEnvironment(baseConfig, &url)` and return `err` when it's not `nil`？
##########
File path: config/config_center_config_test.go
##########
@@ -0,0 +1,95 @@
+/*
+ * 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)
+}
+
+func TestStartConfigCenterWithRemoteRef(t *testing.T) {
+ extension.SetConfigCenterFactory("mock", func() config_center.DynamicConfigurationFactory {
+ return &config_center.MockDynamicConfigurationFactory{}
+ })
+ m := make(map[string]*RemoteConfig)
+ m["mock"] = &RemoteConfig{Protocol: "mock", Address: "172.0.0.1"}
+ baseConfig = &BaseConfig{
+ Remotes: m,
+ ConfigCenterConfig: &ConfigCenterConfig{
+ Group: "dubbo",
+ RemoteRef: "mock",
+ 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)
+
+ baseConfig = nil
Review comment:
This statement seems useless.
##########
File path: config/config_center_config.go
##########
@@ -77,3 +85,94 @@ func (c *ConfigCenterConfig) GetUrlMap() url.Values {
urlMap.Set(constant.CONFIG_LOG_DIR_KEY, c.LogDir)
return urlMap
}
+
+type configCenter struct {
+}
+
+// toURL will compatible with baseConfig.ConfigCenterConfig.Address and baseConfig.ConfigCenterConfig.RemoteRef 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()))
+ }
+
+ remoteRef := baseConfig.ConfigCenterConfig.RemoteRef
+ rc, ok := GetBaseConfig().GetRemoteConfig(remoteRef)
+
+ if !ok {
+ return common.URL{}, perrors.New("Could not find out the remote ref config, name: " + remoteRef)
+ }
+
+ newURL, err := rc.toURL()
+ if err == nil {
+ newURL.SetParams(baseConfig.ConfigCenterConfig.GetUrlMap())
+ }
+ return newURL, err
+}
+
+// startConfigCenter will start the config center.
+// it will prepare the environment
+func (b *configCenter) startConfigCenter(baseConfig BaseConfig) error {
+ url, err := b.toURL(baseConfig)
+ if err != nil {
+ return err
+ }
+ if b.prepareEnvironment(baseConfig, &url) != nil {
+ return perrors.WithMessagef(err, "start config center error!")
+ }
+ // c.fresh()
+ return err
+}
+
+func (b *configCenter) prepareEnvironment(baseConfig BaseConfig, configCenterUrl *common.URL) error {
+ factory := extension.GetConfigCenterFactory(configCenterUrl.Protocol)
+ dynamicConfig, err := factory.GetDynamicConfiguration(configCenterUrl)
+ config.GetEnvInstance().SetDynamicConfiguration(dynamicConfig)
Review comment:
Need this statement be placed after `if err != nil {}`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go] zouyx merged pull request #687: Rft: Optimize remotes configuration
Posted by GitBox <gi...@apache.org>.
zouyx merged pull request #687:
URL: https://github.com/apache/dubbo-go/pull/687
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go] zouyx commented on a change in pull request #687: Rft: Optimize remotes configuration
Posted by GitBox <gi...@apache.org>.
zouyx commented on a change in pull request #687:
URL: https://github.com/apache/dubbo-go/pull/687#discussion_r465825367
##########
File path: config/config_center_config.go
##########
@@ -77,3 +85,94 @@ func (c *ConfigCenterConfig) GetUrlMap() url.Values {
urlMap.Set(constant.CONFIG_LOG_DIR_KEY, c.LogDir)
return urlMap
}
+
+type configCenter struct {
+}
+
+// toURL will compatible with baseConfig.ConfigCenterConfig.Address and baseConfig.ConfigCenterConfig.RemoteRef 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()))
+ }
+
+ remoteRef := baseConfig.ConfigCenterConfig.RemoteRef
+ rc, ok := GetBaseConfig().GetRemoteConfig(remoteRef)
+
+ if !ok {
+ return common.URL{}, perrors.New("Could not find out the remote ref config, name: " + remoteRef)
+ }
+
+ newURL, err := rc.toURL()
+ if err == nil {
+ newURL.SetParams(baseConfig.ConfigCenterConfig.GetUrlMap())
+ }
+ return newURL, err
+}
+
+// startConfigCenter will start the config center.
+// it will prepare the environment
+func (b *configCenter) startConfigCenter(baseConfig BaseConfig) error {
+ url, err := b.toURL(baseConfig)
+ if err != nil {
+ return err
+ }
+ if b.prepareEnvironment(baseConfig, &url) != nil {
Review comment:
agree.
I just copy it.....
It may have some problem before....
##########
File path: config/config_center_config.go
##########
@@ -77,3 +85,94 @@ func (c *ConfigCenterConfig) GetUrlMap() url.Values {
urlMap.Set(constant.CONFIG_LOG_DIR_KEY, c.LogDir)
return urlMap
}
+
+type configCenter struct {
+}
+
+// toURL will compatible with baseConfig.ConfigCenterConfig.Address and baseConfig.ConfigCenterConfig.RemoteRef 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()))
+ }
+
+ remoteRef := baseConfig.ConfigCenterConfig.RemoteRef
+ rc, ok := GetBaseConfig().GetRemoteConfig(remoteRef)
+
+ if !ok {
+ return common.URL{}, perrors.New("Could not find out the remote ref config, name: " + remoteRef)
+ }
+
+ newURL, err := rc.toURL()
+ if err == nil {
+ newURL.SetParams(baseConfig.ConfigCenterConfig.GetUrlMap())
+ }
+ return newURL, err
+}
+
+// startConfigCenter will start the config center.
+// it will prepare the environment
+func (b *configCenter) startConfigCenter(baseConfig BaseConfig) error {
+ url, err := b.toURL(baseConfig)
+ if err != nil {
+ return err
+ }
+ if b.prepareEnvironment(baseConfig, &url) != nil {
+ return perrors.WithMessagef(err, "start config center error!")
+ }
+ // c.fresh()
+ return err
+}
+
+func (b *configCenter) prepareEnvironment(baseConfig BaseConfig, configCenterUrl *common.URL) error {
+ factory := extension.GetConfigCenterFactory(configCenterUrl.Protocol)
+ dynamicConfig, err := factory.GetDynamicConfiguration(configCenterUrl)
+ config.GetEnvInstance().SetDynamicConfiguration(dynamicConfig)
Review comment:
agree.
I just copy it.....
It may have some problem before....
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go] hxmhlt commented on a change in pull request #687: Rft: Optimize remotes configuration
Posted by GitBox <gi...@apache.org>.
hxmhlt commented on a change in pull request #687:
URL: https://github.com/apache/dubbo-go/pull/687#discussion_r465761444
##########
File path: config/remote_config.go
##########
@@ -18,6 +18,7 @@
package config
import (
+ "github.com/apache/dubbo-go/common"
Review comment:
split
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go] zouyx commented on a change in pull request #687: Rft: Optimize remotes configuration
Posted by GitBox <gi...@apache.org>.
zouyx commented on a change in pull request #687:
URL: https://github.com/apache/dubbo-go/pull/687#discussion_r464758550
##########
File path: config/base_config.go
##########
@@ -72,72 +69,19 @@ func (c *BaseConfig) GetRemoteConfig(name string) (config *RemoteConfig, ok bool
return
}
-// startConfigCenter will start the config center.
-// it will prepare the environment
-func (c *BaseConfig) startConfigCenter() error {
- url, err := common.NewURL(c.ConfigCenterConfig.Address,
- common.WithProtocol(c.ConfigCenterConfig.Protocol), common.WithParams(c.ConfigCenterConfig.GetUrlMap()))
- if err != nil {
- return err
- }
- c.configCenterUrl = &url
- if c.prepareEnvironment() != nil {
- return perrors.WithMessagef(err, "start config center error!")
- }
- // c.fresh()
- return err
-}
-
-func (c *BaseConfig) prepareEnvironment() error {
- factory := extension.GetConfigCenterFactory(c.ConfigCenterConfig.Protocol)
- dynamicConfig, err := factory.GetDynamicConfiguration(c.configCenterUrl)
- config.GetEnvInstance().SetDynamicConfiguration(dynamicConfig)
- if err != nil {
- logger.Errorf("Get dynamic configuration error , error message is %v", err)
- return perrors.WithStack(err)
- }
- content, err := dynamicConfig.GetProperties(c.ConfigCenterConfig.ConfigFile, config_center.WithGroup(c.ConfigCenterConfig.Group))
- if err != nil {
- logger.Errorf("Get config content in dynamic configuration error , error message is %v", err)
- return perrors.WithStack(err)
- }
- var appGroup string
- var appContent string
- if providerConfig != nil && providerConfig.ApplicationConfig != nil &&
- reflect.ValueOf(c.fatherConfig).Elem().Type().Name() == "ProviderConfig" {
- appGroup = providerConfig.ApplicationConfig.Name
- } else if consumerConfig != nil && consumerConfig.ApplicationConfig != nil &&
- reflect.ValueOf(c.fatherConfig).Elem().Type().Name() == "ConsumerConfig" {
- appGroup = consumerConfig.ApplicationConfig.Name
- }
+func (c *BaseConfig) toURL(name string, protocol string) (common.URL, error) {
+ rc, ok := GetBaseConfig().GetRemoteConfig(name)
- if len(appGroup) != 0 {
- configFile := c.ConfigCenterConfig.AppConfigFile
- if len(configFile) == 0 {
- configFile = c.ConfigCenterConfig.ConfigFile
- }
- appContent, err = dynamicConfig.GetProperties(configFile, config_center.WithGroup(appGroup))
- if err != nil {
- return perrors.WithStack(err)
- }
+ if !ok {
+ return common.URL{}, perrors.New("Could not find out the remote ref config, name: " + name)
}
- // global config file
- mapContent, err := dynamicConfig.Parser().Parse(content)
- if err != nil {
- return perrors.WithStack(err)
- }
- config.GetEnvInstance().UpdateExternalConfigMap(mapContent)
- // appGroup config file
- if len(appContent) != 0 {
- appMapConent, err := dynamicConfig.Parser().Parse(appContent)
- if err != nil {
- return perrors.WithStack(err)
- }
- config.GetEnvInstance().UpdateAppExternalConfigMap(appMapConent)
- }
-
- return nil
+ return common.NewURL(rc.Address,
Review comment:
ok
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org
[GitHub] [dubbo-go] flycash commented on a change in pull request #687: Rft: Optimize remotes configuration
Posted by GitBox <gi...@apache.org>.
flycash commented on a change in pull request #687:
URL: https://github.com/apache/dubbo-go/pull/687#discussion_r464748857
##########
File path: config/base_config.go
##########
@@ -72,72 +69,19 @@ func (c *BaseConfig) GetRemoteConfig(name string) (config *RemoteConfig, ok bool
return
}
-// startConfigCenter will start the config center.
-// it will prepare the environment
-func (c *BaseConfig) startConfigCenter() error {
- url, err := common.NewURL(c.ConfigCenterConfig.Address,
- common.WithProtocol(c.ConfigCenterConfig.Protocol), common.WithParams(c.ConfigCenterConfig.GetUrlMap()))
- if err != nil {
- return err
- }
- c.configCenterUrl = &url
- if c.prepareEnvironment() != nil {
- return perrors.WithMessagef(err, "start config center error!")
- }
- // c.fresh()
- return err
-}
-
-func (c *BaseConfig) prepareEnvironment() error {
- factory := extension.GetConfigCenterFactory(c.ConfigCenterConfig.Protocol)
- dynamicConfig, err := factory.GetDynamicConfiguration(c.configCenterUrl)
- config.GetEnvInstance().SetDynamicConfiguration(dynamicConfig)
- if err != nil {
- logger.Errorf("Get dynamic configuration error , error message is %v", err)
- return perrors.WithStack(err)
- }
- content, err := dynamicConfig.GetProperties(c.ConfigCenterConfig.ConfigFile, config_center.WithGroup(c.ConfigCenterConfig.Group))
- if err != nil {
- logger.Errorf("Get config content in dynamic configuration error , error message is %v", err)
- return perrors.WithStack(err)
- }
- var appGroup string
- var appContent string
- if providerConfig != nil && providerConfig.ApplicationConfig != nil &&
- reflect.ValueOf(c.fatherConfig).Elem().Type().Name() == "ProviderConfig" {
- appGroup = providerConfig.ApplicationConfig.Name
- } else if consumerConfig != nil && consumerConfig.ApplicationConfig != nil &&
- reflect.ValueOf(c.fatherConfig).Elem().Type().Name() == "ConsumerConfig" {
- appGroup = consumerConfig.ApplicationConfig.Name
- }
+func (c *BaseConfig) toURL(name string, protocol string) (common.URL, error) {
+ rc, ok := GetBaseConfig().GetRemoteConfig(name)
- if len(appGroup) != 0 {
- configFile := c.ConfigCenterConfig.AppConfigFile
- if len(configFile) == 0 {
- configFile = c.ConfigCenterConfig.ConfigFile
- }
- appContent, err = dynamicConfig.GetProperties(configFile, config_center.WithGroup(appGroup))
- if err != nil {
- return perrors.WithStack(err)
- }
+ if !ok {
+ return common.URL{}, perrors.New("Could not find out the remote ref config, name: " + name)
}
- // global config file
- mapContent, err := dynamicConfig.Parser().Parse(content)
- if err != nil {
- return perrors.WithStack(err)
- }
- config.GetEnvInstance().UpdateExternalConfigMap(mapContent)
- // appGroup config file
- if len(appContent) != 0 {
- appMapConent, err := dynamicConfig.Parser().Parse(appContent)
- if err != nil {
- return perrors.WithStack(err)
- }
- config.GetEnvInstance().UpdateAppExternalConfigMap(appMapConent)
- }
-
- return nil
+ return common.NewURL(rc.Address,
Review comment:
I prefer to define method inside RemoteRef:
```go
func (rc *RemoteRef) ToUrl() {
}
```
The RemoteRef is used in many modules, in this way we make sure that if we add more fileds to RemoteRef, all users is updated.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org