aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-29 16:26:30 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-03-29 16:26:30 +0200
commit0d1620f5deaa4df8cee1870d6dce707b38aa8db9 (patch)
treebfe172375ef4bb9d60887159cf6edf4b3107fdee
parentf7bc45795104b666c61473e52f0d9bda865744af (diff)
Rename
-rw-r--r--cmd/goxyctl/main.go22
-rw-r--r--route.go12
-rw-r--r--rpc.go2
-rw-r--r--server.go8
-rw-r--r--server_test.go8
5 files changed, 26 insertions, 26 deletions
diff --git a/cmd/goxyctl/main.go b/cmd/goxyctl/main.go
index 78d65aa..c7a0d07 100644
--- a/cmd/goxyctl/main.go
+++ b/cmd/goxyctl/main.go
@@ -9,12 +9,12 @@ import (
)
var (
- rpcserver = flag.String("server", ":http-alt", "RPC Server")
- servername = flag.String("host", "", "Host URL")
- 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 host")
+ rpcserver = flag.String("server", ":http-alt", "RPC Server")
+ host = flag.String("host", "", "Host URL")
+ 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 host")
)
func loadCert(certFile, keyFile string) ([]byte, []byte) {
@@ -40,12 +40,12 @@ func send(server string, e goxy.Entry, del bool) error {
defer client.Close()
switch {
- case e.ServerName != "" && e.Upstream != "":
+ case e.Host != "" && e.Upstream != "":
log.Println("Add", e)
return client.Call("GoXY.Add", e, nil)
- case e.ServerName != "" && del:
- log.Println("Del", e.ServerName)
- return client.Call("GoXY.Del", e.ServerName, nil)
+ case e.Host != "" && del:
+ log.Println("Del", e.Host)
+ return client.Call("GoXY.Del", e.Host, nil)
default:
var r goxy.Route
err := client.Call("GoXY.List", struct{}{}, &r)
@@ -63,7 +63,7 @@ func main() {
var e goxy.Entry
flag.Parse()
- e.ServerName, e.Upstream = *servername, *upstream
+ e.Host, e.Upstream = *host, *upstream
e.Cert, e.Key = loadCert(*certfile, *keyfile)
if err := send(*rpcserver, e, *remove); err != nil {
diff --git a/route.go b/route.go
index c8c9191..3c83bef 100644
--- a/route.go
+++ b/route.go
@@ -18,15 +18,15 @@ func (r Route) GetCertificate(h *tls.ClientHelloInfo) (*tls.Certificate, error)
// Entry holds routing settings
type Entry struct {
- ServerName string // HostName
- Upstream string // URL
- Cert []byte // PEM
- Key []byte // PEM
- cert *tls.Certificate // Parsed
+ Host string // HostName
+ Upstream string // URL
+ Cert []byte // PEM
+ Key []byte // PEM
+ cert *tls.Certificate // Parsed
}
func (e Entry) String() string {
- ret := e.ServerName + " → " + e.Upstream
+ ret := e.Host + " → " + e.Upstream
if e.cert != nil {
ret += " with TLS"
}
diff --git a/rpc.go b/rpc.go
index 2d843b3..1bff95f 100644
--- a/rpc.go
+++ b/rpc.go
@@ -24,7 +24,7 @@ func DialRPC(server string) (*rpc.Client, error) {
// Add adds a new route
func (s *GoXY) Add(e Entry, _ *struct{}) error {
defer s.Server.Save()
- s.Server.Route[e.ServerName] = e
+ s.Server.Route[e.Host] = e
return s.Server.Restore()
}
diff --git a/server.go b/server.go
index 159362a..c19f3dd 100644
--- a/server.go
+++ b/server.go
@@ -67,14 +67,14 @@ func (s *Server) Restore() error {
if err != nil {
return err
}
- if !strings.Contains(v.ServerName, "/") {
- v.ServerName += "/"
+ if !strings.Contains(v.Host, "/") {
+ v.Host += "/"
}
switch up.Scheme {
case "ws":
- mux.Handle(v.ServerName, NewWebSocketProxy(up))
+ mux.Handle(v.Host, NewWebSocketProxy(up))
default:
- mux.Handle(v.ServerName, httputil.NewSingleHostReverseProxy(up))
+ mux.Handle(v.Host, httputil.NewSingleHostReverseProxy(up))
}
}
s.Server.Handler = mux
diff --git a/server_test.go b/server_test.go
index 881a11a..12e6a53 100644
--- a/server_test.go
+++ b/server_test.go
@@ -66,8 +66,8 @@ func TestReverseProxy(t *testing.T) {
// Test HTTP proxy
e := Entry{
- ServerName: frontURL.Host,
- Upstream: backServer.URL,
+ Host: frontURL.Host,
+ Upstream: backServer.URL,
}
if err := rpcClient.Call("GoXY.Add", e, nil); err != nil {
t.Error(err)
@@ -94,8 +94,8 @@ func TestReverseProxy(t *testing.T) {
// Test WebSocket proxy
e = Entry{
- ServerName: frontURL.Host,
- Upstream: "ws://" + wsURL.Host,
+ Host: frontURL.Host,
+ Upstream: "ws://" + wsURL.Host,
}
if err := rpcClient.Call("GoXY.Add", e, nil); err != nil {
t.Error(err)