aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-25 11:19:58 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-25 11:19:58 +0100
commit80dbf3cbd4a37979f21116f4f03250c025ea41f1 (patch)
treef77366ff0daaccb1eb46f4ef1d2f7881d263552f
parentaee5dfa31c94b7b637121e9fcd5816ce193246f1 (diff)
Revert remove flag
-rw-r--r--goxyctl/main.go15
1 files changed, 8 insertions, 7 deletions
diff --git a/goxyctl/main.go b/goxyctl/main.go
index f955bc6..5fbc1e8 100644
--- a/goxyctl/main.go
+++ b/goxyctl/main.go
@@ -9,10 +9,11 @@ import (
var (
rpcserver = flag.String("server", ":http-alt", "RPC Server port")
- servername = flag.String("host", "", "ServerName (required)")
- upstream = flag.String("upstream", "", "Upstream URL (removes route if emty)")
- keyfile = flag.String("key", "", "TLS Key file (requires cert flag)")
- certfile = flag.String("cert", "", "TLS Cert file (requires key flag)")
+ servername = flag.String("host", "", "ServerName")
+ upstream = flag.String("upstream", "", "Upstream URL")
+ keyfile = flag.String("key", "", "TLS Key file")
+ certfile = flag.String("cert", "", "TLS Cert file")
+ remove = flag.Bool("remove", false, "Remove route")
)
// Entry contains routing settings
@@ -46,7 +47,7 @@ func loadCert(certFile, keyFile string) ([]byte, []byte) {
return cert, key
}
-func send(server string, e Entry) error {
+func send(server string, e Entry, del bool) error {
client, err := rpc.DialHTTP("tcp", server)
if err != nil {
return err
@@ -57,7 +58,7 @@ func send(server string, e Entry) error {
case e.ServerName != "" && e.Upstream != "":
log.Println("Add", e)
return client.Call("GoXY.Add", e, nil)
- case e.ServerName != "" && e.Upstream == "":
+ case e.ServerName != "" && del:
log.Println("Del", e)
return client.Call("GoXY.Del", e, nil)
default:
@@ -80,7 +81,7 @@ func main() {
e.ServerName, e.Upstream = *servername, *upstream
e.Cert, e.Key = loadCert(*certfile, *keyfile)
- if err := send(*rpcserver, e); err != nil {
+ if err := send(*rpcserver, e, *remove); err != nil {
log.Fatal(err)
}
}