From e6f226c64d35763f9e0c35e2d7f2fee976045259 Mon Sep 17 00:00:00 2001 From: Kslr Date: Thu, 2 Jan 2020 01:14:36 +0800 Subject: [PATCH] Revert "add arg -confdir" --- common/platform/ctlcmd/ctlcmd.go | 5 ++-- common/platform/platform.go | 7 ----- infra/conf/v2ray.go | 14 ++++------ infra/control/command.go | 3 --- infra/control/config.go | 6 ++--- main/main.go | 44 +++++--------------------------- 6 files changed, 15 insertions(+), 64 deletions(-) diff --git a/common/platform/ctlcmd/ctlcmd.go b/common/platform/ctlcmd/ctlcmd.go index 1fad1e74e..adebbf7a0 100644 --- a/common/platform/ctlcmd/ctlcmd.go +++ b/common/platform/ctlcmd/ctlcmd.go @@ -4,7 +4,6 @@ import ( "io" "os" "os/exec" - "strings" "v2ray.com/core/common/buf" "v2ray.com/core/common/platform" @@ -36,14 +35,14 @@ func Run(args []string, input io.Reader) (buf.MultiBuffer, error) { if err := cmd.Wait(); err != nil { msg := "failed to execute v2ctl" if errBuffer.Len() > 0 { - msg += ": \n" + strings.TrimSpace(errBuffer.MultiBuffer.String()) + msg += ": " + errBuffer.MultiBuffer.String() } return nil, newError(msg).Base(err) } // log stderr, info message if !errBuffer.IsEmpty() { - newError(" \n", strings.TrimSpace(errBuffer.MultiBuffer.String())).AtInfo().WriteToLog() + newError("v2ctl > \n", errBuffer.MultiBuffer.String()).AtInfo().WriteToLog() } return outBuffer.MultiBuffer, nil diff --git a/common/platform/platform.go b/common/platform/platform.go index b57a98fd7..4fa253d9c 100644 --- a/common/platform/platform.go +++ b/common/platform/platform.go @@ -83,10 +83,3 @@ func GetConfigurationPath() string { configPath := NewEnvFlag(name).GetValue(getExecutableDir) return filepath.Join(configPath, "config.json") } - -// GetConfDirPath reads "v2ray.location.confdir" -func GetConfDirPath() string { - const name = "v2ray.location.confdir" - configPath := NewEnvFlag(name).GetValue(func() string { return "" }) - return configPath -} diff --git a/infra/conf/v2ray.go b/infra/conf/v2ray.go index 56c1a2a49..b87447231 100644 --- a/infra/conf/v2ray.go +++ b/infra/conf/v2ray.go @@ -2,8 +2,6 @@ package conf import ( "encoding/json" - "log" - "os" "strings" "v2ray.com/core" @@ -33,8 +31,6 @@ var ( "mtproto": func() interface{} { return new(MTProtoClientConfig) }, "dns": func() interface{} { return new(DnsOutboundConfig) }, }, "protocol", "settings") - - ctllog = log.New(os.Stderr, "v2ctl> ", 0) ) func toProtocolList(s []string) ([]proxyman.KnownProtocols, error) { @@ -365,10 +361,10 @@ func (c *Config) Override(o *Config, fn string) { if len(c.InboundConfigs) > 0 && len(o.InboundConfigs) == 1 { if idx := c.findInboundTag(o.InboundConfigs[0].Tag); idx > -1 { c.InboundConfigs[idx] = o.InboundConfigs[0] - ctllog.Println("[", fn, "] updated inbound with tag: ", o.InboundConfigs[0].Tag) + newError("<", fn, "> updated inbound with tag: ", o.InboundConfigs[0].Tag).AtInfo().WriteToLog() } else { c.InboundConfigs = append(c.InboundConfigs, o.InboundConfigs[0]) - ctllog.Println("[", fn, "] appended inbound with tag: ", o.InboundConfigs[0].Tag) + newError("<", fn, "> appended inbound with tag: ", o.InboundConfigs[0].Tag).AtInfo().WriteToLog() } } else { c.InboundConfigs = o.InboundConfigs @@ -380,14 +376,14 @@ func (c *Config) Override(o *Config, fn string) { if len(c.OutboundConfigs) > 0 && len(o.OutboundConfigs) == 1 { if idx := c.findOutboundTag(o.OutboundConfigs[0].Tag); idx > -1 { c.OutboundConfigs[idx] = o.OutboundConfigs[0] - ctllog.Println("[", fn, "] updated outbound with tag: ", o.OutboundConfigs[0].Tag) + newError("<", fn, "> updated outbound with tag: ", o.OutboundConfigs[0].Tag).AtInfo().WriteToLog() } else { if strings.Contains(strings.ToLower(fn), "tail") { c.OutboundConfigs = append(c.OutboundConfigs, o.OutboundConfigs[0]) - ctllog.Println("[", fn, "] appended outbound with tag: ", o.OutboundConfigs[0].Tag) + newError("<", fn, "> appended outbound with tag: ", o.OutboundConfigs[0].Tag).AtInfo().WriteToLog() } else { c.OutboundConfigs = append(o.OutboundConfigs, c.OutboundConfigs...) - ctllog.Println("[", fn, "] prepended outbound with tag: ", o.OutboundConfigs[0].Tag) + newError("<", fn, "> prepended outbound with tag: ", o.OutboundConfigs[0].Tag).AtInfo().WriteToLog() } } } else { diff --git a/infra/control/command.go b/infra/control/command.go index 1edeac10c..a261646ac 100644 --- a/infra/control/command.go +++ b/infra/control/command.go @@ -2,8 +2,6 @@ package control import ( "fmt" - "log" - "os" "strings" ) @@ -20,7 +18,6 @@ type Command interface { var ( commandRegistry = make(map[string]Command) - ctllog = log.New(os.Stderr, "v2ctl> ", 0) ) func RegisterCommand(cmd Command) error { diff --git a/infra/control/config.go b/infra/control/config.go index 504975a8c..02d7cd5dd 100644 --- a/infra/control/config.go +++ b/infra/control/config.go @@ -37,13 +37,11 @@ func (c *ConfigCommand) Execute(args []string) error { conf := &conf.Config{} for _, arg := range args { - ctllog.Println("Read config: ", arg) + newError("Reading config: ", arg).AtInfo().WriteToLog() r, err := c.LoadArg(arg) common.Must(err) c, err := serial.DecodeJSONConfig(r) - if err != nil { - ctllog.Fatalln(err) - } + common.Must(err) conf.Override(c, arg) } diff --git a/main/main.go b/main/main.go index 481b998c3..94ba7088d 100644 --- a/main/main.go +++ b/main/main.go @@ -5,11 +5,8 @@ package main import ( "flag" "fmt" - "io/ioutil" - "log" "os" "os/signal" - "path" "path/filepath" "runtime" "strings" @@ -23,10 +20,10 @@ import ( var ( configFiles cmdarg.Arg // "Config file for V2Ray.", the option is customed type, parse in main - configDir string 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.") + errNoConfig = newError("no valid config") ) func fileExists(file string) bool { @@ -34,27 +31,7 @@ func fileExists(file string) bool { return err == nil && !info.IsDir() } -func dirExists(file string) bool { - info, err := os.Stat(file) - return err == nil && info.IsDir() -} - -func readConfDir(dirPath string) { - confs, err := ioutil.ReadDir(dirPath) - if err != nil { - log.Fatalln(err) - } - for _, f := range confs { - if strings.HasSuffix(f.Name(), ".json") { - configFiles.Set(path.Join(dirPath, f.Name())) - } - } -} - func getConfigFilePath() (cmdarg.Arg, error) { - if dirExists(configDir) { - readConfDir(configDir) - } if len(configFiles) > 0 { return configFiles, nil } @@ -62,25 +39,14 @@ func getConfigFilePath() (cmdarg.Arg, error) { if workingDir, err := os.Getwd(); err == nil { configFile := filepath.Join(workingDir, "config.json") if fileExists(configFile) { - log.Println("Using default config: ", configFile) return cmdarg.Arg{configFile}, nil } } if configFile := platform.GetConfigurationPath(); fileExists(configFile) { - log.Println("Using config from env: ", configFile) 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") return cmdarg.Arg{"stdin:"}, nil } @@ -121,8 +87,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.Var(&configFiles, "c", "short alias of -config") flag.Parse() printVersion() @@ -133,8 +98,11 @@ func main() { server, err := startV2Ray() if err != nil { - fmt.Println(err) + fmt.Println(err.Error()) // Configuration error. Exit with a special value to prevent systemd from restarting. + if err == errNoConfig { + flag.PrintDefaults() + } os.Exit(23) }