Skip to content
Snippets Groups Projects
Commit dc7e5d08 authored by 邹毅贤's avatar 邹毅贤
Browse files

fix review comment

parent 2f33bf00
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,6 @@ package config
import (
"encoding/base64"
"net/url"
"os"
"strconv"
"strings"
"sync"
......@@ -59,20 +58,11 @@ func RouterInit(confRouterFile string) error {
}
logger.Debugf("router config{%#v}\n", routerConfig)
directory.AddRouterURLSet(initRouterUrl())
directory.AddRouterURLSet(initRouterUrl(routerConfig))
return nil
}
func initRouterUrl() *common.URL {
mutex.Lock()
if routerConfig == nil {
confRouterFile := os.Getenv(constant.CONF_ROUTER_FILE_PATH)
err := RouterInit(confRouterFile)
if err != nil {
return nil
}
}
mutex.Unlock()
func initRouterUrl(routerConfig *ConditionRouterConfig) *common.URL {
rule := parseCondition(routerConfig.Conditions)
return common.NewURLWithOptions(
......
......@@ -73,7 +73,7 @@ func TestParseCondition(t *testing.T) {
func TestInitRouterUrl(t *testing.T) {
routerConfig = &ConditionRouterConfig{}
loadYmlConfig(testyml, routerConfig)
url := initRouterUrl()
url := initRouterUrl(routerConfig)
assert.Equal(t, url.Protocol, "route")
assert.Equal(t, url.Ip, "0.0.0.0")
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment