From 9c9d0cc7f21f48f6961565ba4a77b0728c34df7e Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Sun, 25 Jul 2021 00:10:59 +0500 Subject: [PATCH] Move yggdrasilctl command line env to main mod --- .../{cmd_line_env => }/cmd_line_env.go | 38 +++++++++---------- cmd/yggdrasilctl/main.go | 19 +++++----- 2 files changed, 28 insertions(+), 29 deletions(-) rename cmd/yggdrasilctl/{cmd_line_env => }/cmd_line_env.go (77%) diff --git a/cmd/yggdrasilctl/cmd_line_env/cmd_line_env.go b/cmd/yggdrasilctl/cmd_line_env.go similarity index 77% rename from cmd/yggdrasilctl/cmd_line_env/cmd_line_env.go rename to cmd/yggdrasilctl/cmd_line_env.go index 21adaa95..19e1f87c 100644 --- a/cmd/yggdrasilctl/cmd_line_env/cmd_line_env.go +++ b/cmd/yggdrasilctl/cmd_line_env.go @@ -1,4 +1,4 @@ -package cmd_line_env +package main import ( "bytes" @@ -15,18 +15,18 @@ import ( ) type CmdLineEnv struct { - Args []string - Endpoint, Server string - Injson, Verbose, Ver bool + args []string + endpoint, server string + injson, verbose, ver bool } -func New() CmdLineEnv { +func newCmdLineEnv() CmdLineEnv { var cmdLineEnv CmdLineEnv - cmdLineEnv.Endpoint = defaults.GetDefaults().DefaultAdminListen + cmdLineEnv.endpoint = defaults.GetDefaults().DefaultAdminListen return cmdLineEnv } -func (cmdLineEnv *CmdLineEnv)ParseFlagsAndArgs() { +func (cmdLineEnv *CmdLineEnv)parseFlagsAndArgs() { flag.Usage = func() { fmt.Fprintf(flag.CommandLine.Output(), "Usage: %s [options] command [key=value] [key=value] ...\n\n", os.Args[0]) fmt.Println("Options:") @@ -45,22 +45,22 @@ func (cmdLineEnv *CmdLineEnv)ParseFlagsAndArgs() { fmt.Println(" - ", os.Args[0], "-endpoint=unix:///var/run/ygg.sock getDHT") } - server := flag.String("endpoint", cmdLineEnv.Endpoint, "Admin socket endpoint") + server := flag.String("endpoint", cmdLineEnv.endpoint, "Admin socket endpoint") injson := flag.Bool("json", false, "Output in JSON format (as opposed to pretty-print)") verbose := flag.Bool("v", false, "Verbose output (includes public keys)") ver := flag.Bool("version", false, "Prints the version of this build") flag.Parse() - cmdLineEnv.Args = flag.Args() - cmdLineEnv.Server = *server - cmdLineEnv.Injson = *injson - cmdLineEnv.Verbose = *verbose - cmdLineEnv.Ver = *ver + cmdLineEnv.args = flag.Args() + cmdLineEnv.server = *server + cmdLineEnv.injson = *injson + cmdLineEnv.verbose = *verbose + cmdLineEnv.ver = *ver } -func (cmdLineEnv *CmdLineEnv)SetEndpoint(logger *log.Logger) { - if cmdLineEnv.Server == cmdLineEnv.Endpoint { +func (cmdLineEnv *CmdLineEnv)setEndpoint(logger *log.Logger) { + if cmdLineEnv.server == cmdLineEnv.endpoint { if config, err := ioutil.ReadFile(defaults.GetDefaults().DefaultConfigFile); err == nil { if bytes.Equal(config[0:2], []byte{0xFF, 0xFE}) || bytes.Equal(config[0:2], []byte{0xFE, 0xFF}) { @@ -76,9 +76,9 @@ func (cmdLineEnv *CmdLineEnv)SetEndpoint(logger *log.Logger) { panic(err) } if ep, ok := dat["AdminListen"].(string); ok && (ep != "none" && ep != "") { - cmdLineEnv.Endpoint = ep + cmdLineEnv.endpoint = ep logger.Println("Found platform default config file", defaults.GetDefaults().DefaultConfigFile) - logger.Println("Using endpoint", cmdLineEnv.Endpoint, "from AdminListen") + logger.Println("Using endpoint", cmdLineEnv.endpoint, "from AdminListen") } else { logger.Println("Configuration file doesn't contain appropriate AdminListen option") logger.Println("Falling back to platform default", defaults.GetDefaults().DefaultAdminListen) @@ -88,7 +88,7 @@ func (cmdLineEnv *CmdLineEnv)SetEndpoint(logger *log.Logger) { logger.Println("Falling back to platform default", defaults.GetDefaults().DefaultAdminListen) } } else { - cmdLineEnv.Endpoint = cmdLineEnv.Server - logger.Println("Using endpoint", cmdLineEnv.Endpoint, "from command line") + cmdLineEnv.endpoint = cmdLineEnv.server + logger.Println("Using endpoint", cmdLineEnv.endpoint, "from command line") } } diff --git a/cmd/yggdrasilctl/main.go b/cmd/yggdrasilctl/main.go index 37d3bdcf..f8884ec5 100644 --- a/cmd/yggdrasilctl/main.go +++ b/cmd/yggdrasilctl/main.go @@ -14,7 +14,6 @@ import ( "strconv" "strings" - "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl/cmd_line_env" "github.com/yggdrasil-network/yggdrasil-go/src/version" ) @@ -38,25 +37,25 @@ func run() int { return 0 }() - cmdLineEnv := cmd_line_env.New() + cmdLineEnv := newCmdLineEnv() - cmdLineEnv.ParseFlagsAndArgs() + cmdLineEnv.parseFlagsAndArgs() - if cmdLineEnv.Ver { + if cmdLineEnv.ver { fmt.Println("Build name:", version.BuildName()) fmt.Println("Build version:", version.BuildVersion()) fmt.Println("To get the version number of the running Yggdrasil node, run", os.Args[0], "getSelf") return 0 } - if len(cmdLineEnv.Args) == 0 { + if len(cmdLineEnv.args) == 0 { flag.Usage() return 0 } - cmdLineEnv.SetEndpoint(logger) + cmdLineEnv.setEndpoint(logger) - conn := connect(cmdLineEnv.Endpoint, logger) + conn := connect(cmdLineEnv.endpoint, logger) logger.Println("Connected") defer conn.Close() @@ -65,7 +64,7 @@ func run() int { send := make(admin_info) recv := make(admin_info) - for c, a := range cmdLineEnv.Args { + for c, a := range cmdLineEnv.args { if c == 0 { if strings.HasPrefix(a, "-") { logger.Printf("Ignoring flag %s as it should be specified before other parameters\n", a) @@ -124,14 +123,14 @@ func run() int { } res := recv["response"].(map[string]interface{}) - if cmdLineEnv.Injson { + if cmdLineEnv.injson { if json, err := json.MarshalIndent(res, "", " "); err == nil { fmt.Println(string(json)) } return 0 } - handleAll(recv, cmdLineEnv.Verbose) + handleAll(recv, cmdLineEnv.verbose) } else { logger.Println("Error receiving response:", err) }