lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 01:27:03 -05:00
Code Issues Releases Wiki Activity

Fix Test Parse flag before flag defined by V2 in main

Browse Source
This commit is contained in:
Shelikhoo 2020-03-23 11:34:53 +08:00
parent 13b309f1b3
commit e61b44ff78
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/main.go
View File

@ -27,6 +27,18 @@ var (
version = flag.Bool("version", false, "Show current version of V2Ray.")
test = flag.Bool("test", false, "Test config file only, without launching V2Ray server.")
format = flag.String("format", "json", "Format of input file.")
/* We have to do this here because Golang's Test will also need to parse flag, before
main func in this file is run.
*/
_ = func() error {
flag.Var(&configFiles, "config", "Config file for V2Ray. Multiple assign is accepted (only json). Latter ones overrides the former ones.")
flag.Var(&configFiles, "c", "Short alias of -config")
flag.StringVar(&configDir, "confdir", "", "A dir with multiple json config")
return nil
}()
)
func fileExists(file string) bool {
@ -120,9 +132,7 @@ func printVersion() {
}
func main() {
flag.Var(&configFiles, "config", "Config file for V2Ray. Multiple assign is accepted (only json). Latter ones overrides the former ones.")
flag.Var(&configFiles, "c", "Short alias of -config")
flag.StringVar(&configDir, "confdir", "", "A dir with multiple json config")
flag.Parse()
printVersion()