cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-25 08:21:36 +00:00
Code Releases Activity

slightly cleaner way for yggdrasilctl to os.exit, making sure defers are called

Browse Source
This commit is contained in:
Arceliar 2019-12-25 17:45:24 -06:00
parent 287d3cf9c4
commit 5bd9391c61
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/yggdrasilctl/main.go
View File

@ -25,14 +25,20 @@ import (
type admin_info map[string]interface{} type admin_info map[string]interface{}
func main() { func main() {
// makes sure we can use defer and still return an error code to the OS
os.Exit(run())
}
func run() int {
logbuffer := &bytes.Buffer{} logbuffer := &bytes.Buffer{}
logger := log.New(logbuffer, "", log.Flags()) logger := log.New(logbuffer, "", log.Flags())
defer func() { defer func() int {
if r := recover(); r != nil { if r := recover(); r != nil {
logger.Println("Fatal error:", r) logger.Println("Fatal error:", r)
fmt.Print(logbuffer) fmt.Print(logbuffer)
os.Exit(1) return 1
} }
return 0
}() }()
endpoint := defaults.GetDefaults().DefaultAdminListen endpoint := defaults.GetDefaults().DefaultAdminListen
@ -62,12 +68,12 @@ func main() {
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 return 0
} }
if len(args) == 0 { if len(args) == 0 {
flag.Usage() flag.Usage()
return return 0
} }
if *server == endpoint { if *server == endpoint {
@ -176,15 +182,15 @@ func main() {
} else { } else {
fmt.Println("Admin socket returned an error but didn't specify any error text") fmt.Println("Admin socket returned an error but didn't specify any error text")
} }
os.Exit(1) return 1
} }
if _, ok := recv["request"]; !ok { if _, ok := recv["request"]; !ok {
fmt.Println("Missing request in response (malformed response?)") fmt.Println("Missing request in response (malformed response?)")
os.Exit(1) return 1
} }
if _, ok := recv["response"]; !ok { if _, ok := recv["response"]; !ok {
fmt.Println("Missing response body (malformed response?)") fmt.Println("Missing response body (malformed response?)")
os.Exit(1) return 1
} }
req := recv["request"].(map[string]interface{}) req := recv["request"].(map[string]interface{})
res := recv["response"].(map[string]interface{}) res := recv["response"].(map[string]interface{})
@ -193,7 +199,7 @@ func main() {
if json, err := json.MarshalIndent(res, "", " "); err == nil { if json, err := json.MarshalIndent(res, "", " "); err == nil {
fmt.Println(string(json)) fmt.Println(string(json))
} }
os.Exit(0) return 0
} }
switch strings.ToLower(req["request"].(string)) { switch strings.ToLower(req["request"].(string)) {
@ -434,7 +440,7 @@ func main() {
} }
if v, ok := recv["status"]; ok && v != "success" { if v, ok := recv["status"]; ok && v != "success" {
os.Exit(1) return 1
} }
os.Exit(0) return 0
} }