diff --git a/config/config_loader.go b/config/config_loader.go index 437f4d7323e66afcf62808b3c8d6bf51cc5bce88..c0084b98c4d4367dcf08cc36b25e2c8906c0e3c4 100644 --- a/config/config_loader.go +++ b/config/config_loader.go @@ -78,6 +78,14 @@ func checkApplicationName(config *ApplicationConfig) { // Load Dubbo Init func Load() { + // init rest config + if err := ConsumerRestConfigInit(); err != nil { + log.Printf("[initConsumerRestConfig] %#v", err) + } + if err := ProviderRestConfigInit(); err != nil { + log.Printf("[initProviderRestConfig] %#v", err) + } + // init router if confRouterFile != "" { if errPro := RouterInit(confRouterFile); errPro != nil { diff --git a/config/rest_config_loader.go b/config/rest_config_loader.go index 1d8f5ac63fa541bd6718df038ede9639e44b3db8..0d8ba7c52e6577170dbb70aab01383ccd83adb69 100644 --- a/config/rest_config_loader.go +++ b/config/rest_config_loader.go @@ -18,7 +18,6 @@ package config import ( - "log" "strconv" "strings" ) @@ -40,17 +39,8 @@ var ( restProviderServiceConfigMap map[string]*rest.RestServiceConfig ) -func init() { - if err := initConsumerRestConfig(); err != nil { - log.Printf("[initConsumerRestConfig] %#v", err) - } - if err := initProviderRestConfig(); err != nil { - log.Printf("[initProviderRestConfig] %#v", err) - } -} - // initConsumerRestConfig ... -func initConsumerRestConfig() error { +func ConsumerRestConfigInit() error { consumerConfigType := GetConsumerConfig().RestConfigType consumerConfigReader := extension.GetSingletonRestConfigReader(consumerConfigType) var restConsumerConfig *rest.RestConsumerConfig @@ -71,7 +61,7 @@ func initConsumerRestConfig() error { } // initProviderRestConfig ... -func initProviderRestConfig() error { +func ProviderRestConfigInit() error { providerConfigType := GetProviderConfig().RestConfigType providerConfigReader := extension.GetSingletonRestConfigReader(providerConfigType) var restProviderConfig *rest.RestProviderConfig diff --git a/config/rest_config_loader_test.go b/config/rest_config_loader_test.go index 50546ba84afecc601194066e7af19c90a32f573d..62436b19cb70e0f6035a1ffacfe489e9039fee64 100644 --- a/config/rest_config_loader_test.go +++ b/config/rest_config_loader_test.go @@ -33,7 +33,7 @@ import ( func TestGetRestConsumerServiceConfig(t *testing.T) { err := os.Setenv(constant.CONF_CONSUMER_FILE_PATH, "./rest/config_reader/reader_impl/testdata/consumer_config.yml") assert.NoError(t, err) - err = initConsumerRestConfig() + err = ConsumerRestConfigInit() assert.NoError(t, err) serviceConfig := GetRestConsumerServiceConfig("UserProvider") assert.NotEmpty(t, serviceConfig) @@ -51,7 +51,7 @@ func TestGetRestConsumerServiceConfig(t *testing.T) { func TestGetRestProviderServiceConfig(t *testing.T) { err := os.Setenv(constant.CONF_PROVIDER_FILE_PATH, "./rest/config_reader/reader_impl/testdata/provider_config.yml") assert.NoError(t, err) - err = initProviderRestConfig() + err = ProviderRestConfigInit() assert.NoError(t, err) serviceConfig := GetRestProviderServiceConfig("UserProvider") assert.NotEmpty(t, serviceConfig)