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

Turn yggdrasilctl CmdLineEnv funcs to methods

Browse source
This commit is contained in:
Alex Kotov 2021-07-23 16:14:35 +05:00
parent ce595ed9ae
commit d81af24fcb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/yggdrasilctl/main.go
View file

@ -50,7 +50,7 @@ func run() int {
cmdLineEnv := createCmdLineEnv() cmdLineEnv := createCmdLineEnv()
parseFlagsAndArgs(&cmdLineEnv) cmdLineEnv.parseFlagsAndArgs()
if cmdLineEnv.ver { if cmdLineEnv.ver {
fmt.Println("Build name:", version.BuildName()) fmt.Println("Build name:", version.BuildName())
@ -64,7 +64,7 @@ func run() int {
return 0 return 0
} }
setEndpoint(&cmdLineEnv, logger) cmdLineEnv.setEndpoint(logger)
var conn net.Conn var conn net.Conn
u, err := url.Parse(cmdLineEnv.endpoint) u, err := url.Parse(cmdLineEnv.endpoint)
@ -182,7 +182,7 @@ func createCmdLineEnv() CmdLineEnv {
return cmdLineEnv return cmdLineEnv
} }
func parseFlagsAndArgs(cmdLineEnv *CmdLineEnv) { 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:")
@ -215,7 +215,7 @@ func parseFlagsAndArgs(cmdLineEnv *CmdLineEnv) {
cmdLineEnv.ver = *ver cmdLineEnv.ver = *ver
} }
func setEndpoint(cmdLineEnv *CmdLineEnv, 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}) ||