up:代码优化

apache · Jun 26, 2021 · 68ab7bf · 68ab7bf
1 parent 036ce96
commit 68ab7bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 25 deletions.
diff --git a/config/config_center_config.go b/config/config_center_config.go
@@ -132,7 +132,8 @@ func (b *configCenter) prepareEnvironment(baseConfig BaseConfig, configCenterUrl
 		logger.Errorf("Get dynamic configuration error , error message is %v", err)
 		return perrors.WithStack(err)
 	}
-	config.GetEnvInstance().SetDynamicConfiguration(dynamicConfig)
+	envInstance := config.GetEnvInstance()
+	envInstance.SetDynamicConfiguration(dynamicConfig)
 	content, err := dynamicConfig.GetProperties(baseConfig.ConfigCenterConfig.ConfigFile,
 		config_center.WithGroup(baseConfig.ConfigCenterConfig.Group))
 	if err != nil {
@@ -164,15 +165,15 @@ func (b *configCenter) prepareEnvironment(baseConfig BaseConfig, configCenterUrl
 	if err != nil {
 		return perrors.WithStack(err)
 	}
-	config.GetEnvInstance().UpdateExternalConfigMap(mapContent)
+	envInstance.UpdateExternalConfigMap(mapContent)
 
 	// appGroup config file
 	if len(appContent) != 0 {
 		appMapContent, err := dynamicConfig.Parser().Parse(appContent)
 		if err != nil {
 			return perrors.WithStack(err)
 		}
-		config.GetEnvInstance().UpdateAppExternalConfigMap(appMapContent)
+		envInstance.UpdateAppExternalConfigMap(appMapContent)
 	}
 
 	return nil

diff --git a/config/config_center_config_test.go b/config/config_center_config_test.go
@@ -59,6 +59,7 @@ func TestStartConfigCenterWithRemoteRef(t *testing.T) {
 	baseConfig := &BaseConfig{
 		Remotes: m,
 		ConfigCenterConfig: &ConfigCenterConfig{
+			Protocol:   "mock",
 			Group:      "dubbo",
 			RemoteRef:  "mock",
 			ConfigFile: "mockDubbo.properties",
@@ -71,25 +72,4 @@ func TestStartConfigCenterWithRemoteRef(t *testing.T) {
 	b, v := config.GetEnvInstance().Configuration().Back().Value.(*config.InmemoryConfiguration).GetProperty("dubbo.application.organization")
 	assert.True(t, b)
 	assert.Equal(t, "ikurento.com", v)
-}
-
-func TestStartConfigCenterWithRemoteRefError(t *testing.T) {
-	extension.SetConfigCenterFactory("mock", func() config_center.DynamicConfigurationFactory {
-		return &config_center.MockDynamicConfigurationFactory{}
-	})
-	m := make(map[string]*RemoteConfig)
-	m["mock"] = &RemoteConfig{Address: "172.0.0.1"}
-	baseConfig := &BaseConfig{
-		Remotes: m,
-		ConfigCenterConfig: &ConfigCenterConfig{
-			Protocol:   "mock",
-			Group:      "dubbo",
-			RemoteRef:  "mock",
-			ConfigFile: "mockDubbo.properties",
-		},
-	}
-
-	c := &configCenter{}
-	err := c.startConfigCenter(*baseConfig)
-	assert.Error(t, err)
-}
+}