修改配置文件名称。

aaronwong1989 · Jul 20, 2022 · 9a71224 · 9a71224
1 parent ca431c5
commit 9a71224
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 14 deletions.
diff --git a/cmd/ismg/cmpp/main.go b/cmd/ismg/cmpp/main.go
@@ -15,7 +15,10 @@ var log = logging.GetDefaultLogger()
 
 func main() {
 	rand.Seed(time.Now().Unix()) // 随机种子
-	cmpp.Conf = yml_config.CreateYamlFactory("cmpp.yaml")
+
+	cmpp.Conf = yml_config.CreateYamlFactory("cmpp")
+	cmpp.Conf.ConfigFileChangeListen()
+
 	dc := cmpp.Conf.GetInt("data-center-id")
 	wk := cmpp.Conf.GetInt("worker-id")
 	cmpp.Seq32 = comm.NewCycleSequence(int32(dc), int32(wk))

diff --git a/cmd/ismg/cmpp/server_test.go b/cmd/ismg/cmpp/server_test.go
@@ -22,7 +22,9 @@ import (
 
 func init() {
 	rand.Seed(time.Now().Unix()) // 随机种子
-	cmpp.Conf = yml_config.CreateYamlFactory("cmpp.yaml")
+	cmpp.Conf = yml_config.CreateYamlFactory("cmpp")
+	cmpp.Conf.ConfigFileChangeListen()
+
 	dc := cmpp.Conf.GetInt("data-center-id")
 	wk := cmpp.Conf.GetInt("worker-id")
 	cmpp.Seq32 = comm.NewCycleSequence(int32(dc), int32(wk))

diff --git a/cmd/ismg/smgp/main.go b/cmd/ismg/smgp/main.go
@@ -14,7 +14,10 @@ var log = logging.GetDefaultLogger()
 
 func main() {
 	rand.Seed(time.Now().Unix()) // 随机种子
-	smgp.Conf = yml_config.CreateYamlFactory("smgp.yaml")
+
+	smgp.Conf = yml_config.CreateYamlFactory("smgp")
+	smgp.Conf.ConfigFileChangeListen()
+
 	dc := smgp.Conf.GetInt("data-center-id")
 	wk := smgp.Conf.GetInt("worker-id")
 	smgwId := smgp.Conf.GetString("smgw-id")

diff --git a/cmd/ismg/smgp/server_test.go b/cmd/ismg/smgp/server_test.go
@@ -21,7 +21,9 @@ import (
 
 func init() {
 	rand.Seed(time.Now().Unix()) // 随机种子
-	smgp.Conf = yml_config.CreateYamlFactory("smgp.yaml")
+	smgp.Conf = yml_config.CreateYamlFactory("smgp")
+	smgp.Conf.ConfigFileChangeListen()
+
 	dc := smgp.Conf.GetInt("data-center-id")
 	wk := smgp.Conf.GetInt("worker-id")
 	smgwId := smgp.Conf.GetString("smgw-id")

diff --git a/codec/cmpp/header_test.go b/codec/cmpp/header_test.go
@@ -15,7 +15,9 @@ import (
 
 func init() {
 	rand.Seed(time.Now().Unix()) // 随机种子
-	Conf = yml_config.CreateYamlFactory("cmpp.yaml")
+	Conf = yml_config.CreateYamlFactory("cmpp")
+	Conf.ConfigFileChangeListen()
+
 	dc := Conf.GetInt("data-center-id")
 	wk := Conf.GetInt("worker-id")
 	Seq32 = comm.NewCycleSequence(int32(dc), int32(wk))

diff --git a/codec/smgp/active_test.go b/codec/smgp/active_test.go
@@ -8,7 +8,9 @@ import (
 )
 
 func init() {
-	Conf = yml_config.CreateYamlFactory("smgp.yaml")
+	Conf = yml_config.CreateYamlFactory("smgp")
+	Conf.ConfigFileChangeListen()
+
 	dc := Conf.GetInt("data-center-id")
 	wk := Conf.GetInt("worker-id")
 	smgwId := Conf.GetString("smgw-id")

diff --git a/comm/tool_test.go b/comm/tool_test.go
@@ -27,5 +27,5 @@ func TestUcs2Encode(t *testing.T) {
 }
 
 func TestDiceCheck(t *testing.T) {
-	assert.True(t, DiceCheck(0.99))
+	assert.False(t, DiceCheck(1))
 }
diff --git a/comm/yml_config/yml_config.go b/comm/yml_config/yml_config.go
@@ -57,19 +57,16 @@ func CreateYamlFactory(fileName ...string) YmlConfig {
 		yamlConfig.SetConfigName(fileName[0])
 	}
 	// 设置配置文件类型(后缀)为 yml
-	yamlConfig.SetConfigType("yaml")
+	yamlConfig.SetConfigType("yml")
 
 	if err := yamlConfig.ReadInConfig(); err != nil {
 		log.Fatalf("配置文件初始化失败：", err.Error())
 	}
 
-	conf := &ymlLoader{
+	return &ymlLoader{
 		viper: yamlConfig,
 		mu:    new(sync.Mutex),
 	}
-	conf.ConfigFileChangeListen()
-
-	return conf
 }
 
 type ymlLoader struct {

diff --git a/config/cmpp.yaml → config/cmpp.yml b/config/cmpp.yaml → config/cmpp.yml
@@ -35,7 +35,7 @@ default-valid-duration: 2h
 
 ### 以下是模拟网关运行情况的参数 ###
 # 成功率：
-success-rate: 0.95
+success-rate: 0.96
 # Mt响应的最大与最小时间，状态报告在fix-report-resp-ms后发送
 min-submit-resp-ms: 1
 max-submit-resp-ms: 3

diff --git a/config/smgp.yaml → config/smgp.yml b/config/smgp.yaml → config/smgp.yml
@@ -40,7 +40,7 @@ default-valid-duration: 2h
 # 95  表示 95%
 # 99  表示 99%
 # 999 表示 99.9%
-success-rate: 965
+success-rate: 96
 # Mt响应的最大与最小时间，状态报告在fix-report-resp-ms后发送
 min-submit-resp-ms: 1
 max-submit-resp-ms: 3