github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix confdir env startup priority

pull/2365/head
vcptr 2020-03-23 16:33:49 +08:00
parent b217cade28
commit ab616d91ae
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main/main.go
View File

@ -35,6 +35,9 @@ func fileExists(file string) bool {
} }
func dirExists(file string) bool { func dirExists(file string) bool {
if file == "" {
return false
}
info, err := os.Stat(file) info, err := os.Stat(file)
return err == nil && info.IsDir() return err == nil && info.IsDir()
} }
@ -53,8 +56,18 @@ func readConfDir(dirPath string) {
func getConfigFilePath() (cmdarg.Arg, error) { func getConfigFilePath() (cmdarg.Arg, error) {
if dirExists(configDir) { if dirExists(configDir) {
log.Println("Using confdir from arg:", configDir)
readConfDir(configDir) readConfDir(configDir)
} else {
if envConfDir := platform.GetConfDirPath(); dirExists(envConfDir) {
log.Println("Using confdir from env:", envConfDir)
readConfDir(envConfDir)
if len(configFiles) > 0 {
return configFiles, nil
} }
}
}
if len(configFiles) > 0 { if len(configFiles) > 0 {
return configFiles, nil return configFiles, nil
} }
@ -72,14 +85,6 @@ func getConfigFilePath() (cmdarg.Arg, error) {
return cmdarg.Arg{configFile}, nil return cmdarg.Arg{configFile}, nil
} }
if envConfDir := platform.GetConfDirPath(); dirExists(envConfDir) {
log.Println("Using confdir from env: ", envConfDir)
readConfDir(envConfDir)
if len(configFiles) > 0 {
return configFiles, nil
}
}
log.Println("Using config from STDIN") log.Println("Using config from STDIN")
return cmdarg.Arg{"stdin:"}, nil return cmdarg.Arg{"stdin:"}, nil
} }