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

filter .json in confDir

pull/2148/head
vcptr 2019-12-31 13:11:34 +08:00
parent 5ae47d45c2
commit c3f55dcd67
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infra/control/config.go
View File

@ -41,7 +41,9 @@ func (c *ConfigCommand) Execute(args []string) error {
r, err := c.LoadArg(arg) r, err := c.LoadArg(arg)
common.Must(err) common.Must(err)
c, err := serial.DecodeJSONConfig(r) c, err := serial.DecodeJSONConfig(r)
common.Must(err) if err != nil {
ctllog.Fatalln(err)
}
conf.Override(c, arg) conf.Override(c, arg)
} }

4
main/main.go
View File

@ -46,7 +46,9 @@ func readConfDir(dirPath string) {
log.Fatalln(err) log.Fatalln(err)
} }
for _, f := range confs { for _, f := range confs {
configFiles.Set(path.Join(dirPath, f.Name())) if strings.HasSuffix(f.Name(), ".json") {
configFiles.Set(path.Join(dirPath, f.Name()))
}
} }
} }