aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-04-04 01:50:41 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-04-04 01:50:41 +0200
commit9e3cbd9fcb2cc9c8e7d9ba7d3d8c817872a58dbf (patch)
treee0bfdb5625a4c30b01a22bc7cd434c77b0c584f5
parent7f73b75d3ff5b3af9a9719adfaa777358b191c03 (diff)
Update goxyctl
-rw-r--r--cmd/goxyctl/main.go24
1 files changed, 12 insertions, 12 deletions
diff --git a/cmd/goxyctl/main.go b/cmd/goxyctl/main.go
index a1e6b39..bce92a3 100644
--- a/cmd/goxyctl/main.go
+++ b/cmd/goxyctl/main.go
@@ -17,15 +17,15 @@ var (
remove = flag.Bool("remove", false, "Remove host")
)
-func getEntry() (e goxy.Entry, err error) {
- e.Host = *host
- e.Upstream = *upstream
+func getRoute() (r goxy.Route, err error) {
+ r.Host = *host
+ r.Upstream = *upstream
if *certfile != "" && *keyfile != "" {
- e.Cert, err = ioutil.ReadFile(*certfile)
+ r.Cert, err = ioutil.ReadFile(*certfile)
if err != nil {
return
}
- e.Key, err = ioutil.ReadFile(*keyfile)
+ r.Key, err = ioutil.ReadFile(*keyfile)
if err != nil {
return
}
@@ -33,7 +33,7 @@ func getEntry() (e goxy.Entry, err error) {
return
}
-func send(server string, e goxy.Entry, del bool) error {
+func send(server string, r goxy.Route, del bool) error {
client, err := goxy.DialRPC(server)
if err != nil {
return err
@@ -41,10 +41,10 @@ func send(server string, e goxy.Entry, del bool) error {
defer client.Close()
switch {
- case e.Host != "" && e.Upstream != "":
- return client.Call("GoXY.Add", e, nil)
- case e.Host != "" && del:
- return client.Call("GoXY.Del", e.Host, nil)
+ case r.Host != "" && r.Upstream != "":
+ return client.Call("GoXY.Add", r, nil)
+ case r.Host != "" && del:
+ return client.Call("GoXY.Del", r.Host, nil)
default:
var ret []string
err := client.Call("GoXY.List", struct{}{}, &ret)
@@ -61,12 +61,12 @@ func send(server string, e goxy.Entry, del bool) error {
func main() {
flag.Parse()
- e, err := getEntry()
+ r, err := getRoute()
if err != nil {
log.Fatal(err)
}
- if err := send(*rpcserver, e, *remove); err != nil {
+ if err := send(*rpcserver, r, *remove); err != nil {
log.Fatal(err)
}
}