Commit 40ba7541 authored by liguobao's avatar liguobao

fix: 调整配置文件读取,适配Windows

parent ba075fd5
......@@ -2,7 +2,7 @@ tunnel_addr: majora-vps.virjar.com:5879
dns_server: 114.114.114.114:53
log_level: info
log_path: ./majora-log/
daemon: true
#daemon: true
reconn_interval: 5s
#net_check_interval: 5s
net_check_url: https://www.baidu.com
......
package initialize
import (
"fmt"
"runtime"
"strings"
"github.com/fsnotify/fsnotify"
"github.com/spf13/viper"
)
......@@ -27,8 +31,13 @@ func MustInitConfig(configFileName string, config interface{}) {
func initConfig(configFileName string, config interface{}) (*viper.Viper, error) {
if configFileName == "" {
configFileName = "./conf/majora-dev.yaml"
configFileName = "./majora.yaml"
}
if runtime.GOOS == "windows"{
configFileName = strings.ReplaceAll(configFileName, "/","\\")
fmt.Printf("run on Windows,configFileName:%s\n",configFileName)
}
fmt.Printf("configFileName:%s\n",configFileName)
v := viper.New()
v.SetConfigFile(configFileName)
err := readAndUnmarshalConfig(v, config)
......
Markdown is supported
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