aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-29 17:04:01 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-03-29 17:04:01 +0200
commitc1057f8fbf703b8fb18bb779d94771d2738ec073 (patch)
tree7e998fd601501c9d95f128f6a3158f44d741004d
parentbed5281851cf8dbbf512c88c71d6686c481e8119 (diff)
Simplify
-rw-r--r--cmd/goxyctl/main.go32
1 files changed, 17 insertions, 15 deletions
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)