mirrors
/
Xray-core
mirror of https://github.com/XTLS/Xray-core.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Enable loading TOML & YAML by confdir (#120)

This commit is contained in:
秋のかえで 2021-01-01 20:16:22 +08:00 committed by GitHub
parent 38ec9208d8
commit 9d4038427d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/run.go
View File

@ -8,6 +8,7 @@ import (
"os/signal" "os/signal"
"path" "path"
"path/filepath" "path/filepath"
"regexp"
"runtime" "runtime"
"runtime/debug" "runtime/debug"
"strings" "strings"
@ -120,7 +121,11 @@ func readConfDir(dirPath string) {
log.Fatalln(err) log.Fatalln(err)
} }
for _, f := range confs { for _, f := range confs {
if strings.HasSuffix(f.Name(), ".json") { matched, err := regexp.MatchString(`^.+\.(json|toml|yaml|yml)$`, f.Name())
if err != nil {
log.Fatalln(err)
}
if matched {
configFiles.Set(path.Join(dirPath, f.Name())) configFiles.Set(path.Join(dirPath, f.Name()))
} }
} }