From c1057f8fbf703b8fb18bb779d94771d2738ec073 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 29 Mar 2016 17:04:01 +0200 Subject: Simplify --- cmd/goxyctl/main.go | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'cmd') diff --git a/cmd/goxyctl/main.go b/cmd/goxyctl/main.go index e323a1b..dd7c86d 100644 --- a/cmd/goxyctl/main.go +++ b/cmd/goxyctl/main.go @@ -17,19 +17,20 @@ var ( remove = flag.Bool("remove", false, "Remove host") ) -func loadCert(certFile, keyFile string) ([]byte, []byte) { - if certFile == "" || keyFile == "" { - return nil, nil - } - cert, err := ioutil.ReadFile(certFile) - if err != nil { - log.Fatal(err) - } - key, err := ioutil.ReadFile(keyFile) - if err != nil { - log.Fatal(err) +func getEntry() (e goxy.Entry, err error) { + e.Host = *host + e.Upstream = *upstream + if *certfile != "" && *keyfile != "" { + e.Cert, err = ioutil.ReadFile(*certfile) + if err != nil { + return + } + e.Key, err = ioutil.ReadFile(*keyfile) + if err != nil { + return + } } - return cert, key + return } func send(server string, e goxy.Entry, del bool) error { @@ -60,11 +61,12 @@ func send(server string, e goxy.Entry, del bool) error { } func main() { - var e goxy.Entry flag.Parse() - e.Host, e.Upstream = *host, *upstream - e.Cert, e.Key = loadCert(*certfile, *keyfile) + e, err := getEntry() + if err != nil { + log.Fatal(err) + } if err := send(*rpcserver, e, *remove); err != nil { log.Fatal(err) -- cgit v1.2.3