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

make sure genconf exits, clean up some commented out code

Browse source
This commit is contained in:
Arceliar 2021-07-03 17:27:00 -05:00
parent 9239ed70e4
commit 5844079f67
1 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cmd/yggdrasil/main.go
View file

@ -226,22 +226,6 @@ func getArgs() yggArgs {
// The main function is responsible for configuring and starting Yggdrasil. // The main function is responsible for configuring and starting Yggdrasil.
func run(args yggArgs, ctx context.Context, done chan struct{}) { func run(args yggArgs, ctx context.Context, done chan struct{}) {
defer close(done) defer close(done)
// Configure the command line parameters.
/*
genconf := flag.Bool("genconf", false, "print a new config to stdout")
useconf := flag.Bool("useconf", false, "read HJSON/JSON config from stdin")
useconffile := flag.String("useconffile", "", "read HJSON/JSON config from specified file path")
normaliseconf := flag.Bool("normaliseconf", false, "use in combination with either -useconf or -useconffile, outputs your configuration normalised")
confjson := flag.Bool("json", false, "print configuration from -genconf or -normaliseconf as JSON instead of HJSON")
autoconf := flag.Bool("autoconf", false, "automatic mode (dynamic IP, peer with IPv6 neighbors)")
ver := flag.Bool("version", false, "prints the version of this build")
logto := flag.String("logto", "stdout", "file path to log to, \"syslog\" or \"stdout\"")
getaddr := flag.Bool("address", false, "returns the IPv6 address as derived from the supplied configuration")
getsnet := flag.Bool("subnet", false, "returns the IPv6 subnet as derived from the supplied configuration")
loglevel := flag.String("loglevel", "info", "loglevel to enable")
flag.Parse()
*/
// Create a new logger that logs output to stdout. // Create a new logger that logs output to stdout.
var logger *log.Logger var logger *log.Logger
switch args.logto { switch args.logto {
@ -301,6 +285,7 @@ func run(args yggArgs, ctx context.Context, done chan struct{}) {
case args.genconf: case args.genconf:
// Generate a new configuration and print it to stdout. // Generate a new configuration and print it to stdout.
fmt.Println(doGenconf(args.confjson)) fmt.Println(doGenconf(args.confjson))
return
default: default:
// No flags were provided, therefore print the list of flags to stdout. // No flags were provided, therefore print the list of flags to stdout.
flag.PrintDefaults() flag.PrintDefaults()
@ -414,6 +399,8 @@ func main() {
cancel() cancel()
<-done <-done
return return
case <-done:
return
} }
} }
} }