From e9e0c1f3abf1bbf83ebdb933d318caa2a45c15b0 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期六, 30 三月 2024 17:14:11 +0800
Subject: [PATCH] 调整代码结构, 精简比对过程
---
config/config.go | 53 +++++++++++++----------------------------------------
1 files changed, 13 insertions(+), 40 deletions(-)
diff --git a/config/config.go b/config/config.go
index b528065..330859d 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1,33 +1,14 @@
package config
import (
+ "fmt"
+
"basic.com/valib/logger.git"
"github.com/fsnotify/fsnotify"
"github.com/spf13/viper"
- "log"
)
-type server struct {
- AnalyServerId string `mapstructure:"analyServerId"`
- NetworkAdapter string `mapstructure:"networkAdapter"`
-}
-
-var Server = &server{}
-
-type esinfo struct {
- EsIndex esindexlist `mapstructure:"index"`
-}
-
-type esindexlist struct {
- AiOcean index `mapstructure:"aiOcean"`
-}
-
-type index struct {
- IndexName string `mapstructure:"index"`
- IndexType string `mapstructure:"type"`
-}
-
-type dbpersoncompare struct {
+type database struct {
MysqlAddr string `mapstructure:"mysqlAddr"`
Username string `mapstructure:"username"`
Password string `mapstructure:"password"`
@@ -36,17 +17,7 @@
ServePort int `mapstructure:"servePort"`
}
-type espersoncompare struct {
- ServePort int `mapstructure:"servePort"`
- ESIP string `mapstructure:"esip"`
- ESPort string `mapstructure:"esPort"`
-}
-
-var DbPersonCompInfo = &dbpersoncompare{}
-
-var EsCompServerInfo = &espersoncompare{}
-
-var EsInfo = &esinfo{}
+var DbPersonCompInfo = &database{}
type LogConfig struct {
Path string `mapstructure:"path"` //鏃ュ織瀛樺偍璺緞
@@ -58,29 +29,31 @@
var LogConf = &LogConfig{}
-func Init(env string) {
+func Init() error {
var err error
v := viper.New()
v.SetConfigType("yaml")
- v.SetConfigName(env)
+ v.SetConfigName("compare")
v.AddConfigPath("./")
v.AddConfigPath("./config/")
err = v.ReadInConfig()
if err != nil {
- log.Fatal("error on parsing configuration file")
+ fmt.Printf("error on parsing configuration file, %s, config file compare.yaml\n", err.Error())
+ return err
}
+
read2Conf(v)
v.WatchConfig()
v.OnConfigChange(func(in fsnotify.Event) {
read2Conf(v)
})
+
+ return nil
}
func read2Conf(v *viper.Viper) {
- v.UnmarshalKey("es", EsInfo)
- v.UnmarshalKey("server", Server)
- v.UnmarshalKey("dbpersoncompare", DbPersonCompInfo)
- v.UnmarshalKey("espersoncompare", EsCompServerInfo)
+ v.UnmarshalKey("database", DbPersonCompInfo)
v.UnmarshalKey("log", LogConf)
+
logger.SetLevel(LogConf.Level)
}
--
Gitblit v1.8.0