yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-29 22:55:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move yggdrasilctl command line env to main mod

Browse source
This commit is contained in:
Alex Kotov 2021-07-25 00:10:59 +05:00
parent b3ca1c40a1
commit 9c9d0cc7f2
2 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

38
cmd/yggdrasilctl/cmd_line_env/cmd_line_env.go → cmd/yggdrasilctl/cmd_line_env.go
View file

@ -1,4 +1,4 @@
package cmd_line_env package main
import ( import (
"bytes" "bytes"
@ -15,18 +15,18 @@ import (
) )
type CmdLineEnv struct { type CmdLineEnv struct {
Args []string args []string
Endpoint, Server string endpoint, server string
Injson, Verbose, Ver bool injson, verbose, ver bool
} }
func New() CmdLineEnv { func newCmdLineEnv() CmdLineEnv {
var cmdLineEnv CmdLineEnv var cmdLineEnv CmdLineEnv
cmdLineEnv.Endpoint = defaults.GetDefaults().DefaultAdminListen cmdLineEnv.endpoint = defaults.GetDefaults().DefaultAdminListen
return cmdLineEnv return cmdLineEnv
} }
func (cmdLineEnv *CmdLineEnv)ParseFlagsAndArgs() { func (cmdLineEnv *CmdLineEnv)parseFlagsAndArgs() {
flag.Usage = func() { flag.Usage = func() {
fmt.Fprintf(flag.CommandLine.Output(), "Usage: %s [options] command [key=value] [key=value] ...\n\n", os.Args[0]) fmt.Fprintf(flag.CommandLine.Output(), "Usage: %s [options] command [key=value] [key=value] ...\n\n", os.Args[0])
fmt.Println("Options:") fmt.Println("Options:")
@ -45,22 +45,22 @@ func (cmdLineEnv *CmdLineEnv)ParseFlagsAndArgs() {
fmt.Println(" - ", os.Args[0], "-endpoint=unix:///var/run/ygg.sock getDHT") 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)") injson := flag.Bool("json", false, "Output in JSON format (as opposed to pretty-print)")
verbose := flag.Bool("v", false, "Verbose output (includes public keys)") verbose := flag.Bool("v", false, "Verbose output (includes public keys)")
ver := flag.Bool("version", false, "Prints the version of this build") ver := flag.Bool("version", false, "Prints the version of this build")
flag.Parse() flag.Parse()
cmdLineEnv.Args = flag.Args() cmdLineEnv.args = flag.Args()
cmdLineEnv.Server = *server cmdLineEnv.server = *server
cmdLineEnv.Injson = *injson cmdLineEnv.injson = *injson
cmdLineEnv.Verbose = *verbose cmdLineEnv.verbose = *verbose
cmdLineEnv.Ver = *ver cmdLineEnv.ver = *ver
} }
func (cmdLineEnv *CmdLineEnv)SetEndpoint(logger *log.Logger) { func (cmdLineEnv *CmdLineEnv)setEndpoint(logger *log.Logger) {
if cmdLineEnv.Server == cmdLineEnv.Endpoint { if cmdLineEnv.server == cmdLineEnv.endpoint {
if config, err := ioutil.ReadFile(defaults.GetDefaults().DefaultConfigFile); err == nil { if config, err := ioutil.ReadFile(defaults.GetDefaults().DefaultConfigFile); err == nil {
if bytes.Equal(config[0:2], []byte{0xFF, 0xFE}) || if bytes.Equal(config[0:2], []byte{0xFF, 0xFE}) ||
bytes.Equal(config[0:2], []byte{0xFE, 0xFF}) { bytes.Equal(config[0:2], []byte{0xFE, 0xFF}) {
@ -76,9 +76,9 @@ func (cmdLineEnv *CmdLineEnv)SetEndpoint(logger *log.Logger) {
panic(err) panic(err)
} }
if ep, ok := dat["AdminListen"].(string); ok && (ep != "none" && ep != "") { 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("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 { } else {
logger.Println("Configuration file doesn't contain appropriate AdminListen option") logger.Println("Configuration file doesn't contain appropriate AdminListen option")
logger.Println("Falling back to platform default", defaults.GetDefaults().DefaultAdminListen) 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) logger.Println("Falling back to platform default", defaults.GetDefaults().DefaultAdminListen)
} }
} else { } else {
cmdLineEnv.Endpoint = cmdLineEnv.Server cmdLineEnv.endpoint = cmdLineEnv.server
logger.Println("Using endpoint", cmdLineEnv.Endpoint, "from command line") logger.Println("Using endpoint", cmdLineEnv.endpoint, "from command line")
} }
} }

19
cmd/yggdrasilctl/main.go
View file

@ -14,7 +14,6 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl/cmd_line_env"
"github.com/yggdrasil-network/yggdrasil-go/src/version" "github.com/yggdrasil-network/yggdrasil-go/src/version"
) )
@ -38,25 +37,25 @@ func run() int {
return 0 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 name:", version.BuildName())
fmt.Println("Build version:", version.BuildVersion()) fmt.Println("Build version:", version.BuildVersion())
fmt.Println("To get the version number of the running Yggdrasil node, run", os.Args[0], "getSelf") fmt.Println("To get the version number of the running Yggdrasil node, run", os.Args[0], "getSelf")
return 0 return 0
} }
if len(cmdLineEnv.Args) == 0 { if len(cmdLineEnv.args) == 0 {
flag.Usage() flag.Usage()
return 0 return 0
} }
cmdLineEnv.SetEndpoint(logger) cmdLineEnv.setEndpoint(logger)
conn := connect(cmdLineEnv.Endpoint, logger) conn := connect(cmdLineEnv.endpoint, logger)
logger.Println("Connected") logger.Println("Connected")
defer conn.Close() defer conn.Close()
@ -65,7 +64,7 @@ func run() int {
send := make(admin_info) send := make(admin_info)
recv := make(admin_info) recv := make(admin_info)
for c, a := range cmdLineEnv.Args { for c, a := range cmdLineEnv.args {
if c == 0 { if c == 0 {
if strings.HasPrefix(a, "-") { if strings.HasPrefix(a, "-") {
logger.Printf("Ignoring flag %s as it should be specified before other parameters\n", 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{}) res := recv["response"].(map[string]interface{})
if cmdLineEnv.Injson { if cmdLineEnv.injson {
if json, err := json.MarshalIndent(res, "", " "); err == nil { if json, err := json.MarshalIndent(res, "", " "); err == nil {
fmt.Println(string(json)) fmt.Println(string(json))
} }
return 0 return 0
} }
handleAll(recv, cmdLineEnv.Verbose) handleAll(recv, cmdLineEnv.verbose)
} else { } else {
logger.Println("Error receiving response:", err) logger.Println("Error receiving response:", err)
} }