From 9d3809646a295a419cbe1e631d8a44eb25f71dd3 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Thu, 5 Apr 2018 10:54:53 -0700 Subject: [PATCH] functional-tester/agent: use "proxy.Server" Signed-off-by: Gyuho Lee --- tools/functional-tester/agent/handler.go | 10 +++++----- tools/functional-tester/agent/server.go | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/functional-tester/agent/handler.go b/tools/functional-tester/agent/handler.go index 936c3bb3a..f90e3165c 100644 --- a/tools/functional-tester/agent/handler.go +++ b/tools/functional-tester/agent/handler.go @@ -24,7 +24,7 @@ import ( "time" "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/transport" + "github.com/coreos/etcd/pkg/proxy" "github.com/coreos/etcd/tools/functional-tester/rpcpb" "go.uber.org/zap" @@ -119,7 +119,7 @@ func (srv *Server) startProxy() error { return err } - srv.advertiseClientPortToProxy[advertiseClientURLPort] = transport.NewProxy(transport.ProxyConfig{ + srv.advertiseClientPortToProxy[advertiseClientURLPort] = proxy.NewServer(proxy.ServerConfig{ Logger: srv.lg, From: *advertiseClientURL, To: *listenClientURL, @@ -142,7 +142,7 @@ func (srv *Server) startProxy() error { return err } - srv.advertisePeerPortToProxy[advertisePeerURLPort] = transport.NewProxy(transport.ProxyConfig{ + srv.advertisePeerPortToProxy[advertisePeerURLPort] = proxy.NewServer(proxy.ServerConfig{ Logger: srv.lg, From: *advertisePeerURL, To: *listenPeerURL, @@ -176,7 +176,7 @@ func (srv *Server) stopProxy() { zap.String("to", px.To()), ) } - srv.advertiseClientPortToProxy = make(map[int]transport.Proxy) + srv.advertiseClientPortToProxy = make(map[int]proxy.Server) } if srv.Member.EtcdPeerProxy && len(srv.advertisePeerPortToProxy) > 0 { for port, px := range srv.advertisePeerPortToProxy { @@ -196,7 +196,7 @@ func (srv *Server) stopProxy() { zap.String("to", px.To()), ) } - srv.advertisePeerPortToProxy = make(map[int]transport.Proxy) + srv.advertisePeerPortToProxy = make(map[int]proxy.Server) } } diff --git a/tools/functional-tester/agent/server.go b/tools/functional-tester/agent/server.go index d693a961b..f020b5ad4 100644 --- a/tools/functional-tester/agent/server.go +++ b/tools/functional-tester/agent/server.go @@ -21,7 +21,7 @@ import ( "os/exec" "strings" - "github.com/coreos/etcd/pkg/transport" + "github.com/coreos/etcd/pkg/proxy" "github.com/coreos/etcd/tools/functional-tester/rpcpb" "go.uber.org/zap" @@ -50,8 +50,8 @@ type Server struct { etcdLogFile *os.File // forward incoming advertise URLs traffic to listen URLs - advertiseClientPortToProxy map[int]transport.Proxy - advertisePeerPortToProxy map[int]transport.Proxy + advertiseClientPortToProxy map[int]proxy.Server + advertisePeerPortToProxy map[int]proxy.Server } // NewServer returns a new agent server. @@ -65,8 +65,8 @@ func NewServer( network: network, address: address, last: rpcpb.Operation_NotStarted, - advertiseClientPortToProxy: make(map[int]transport.Proxy), - advertisePeerPortToProxy: make(map[int]transport.Proxy), + advertiseClientPortToProxy: make(map[int]proxy.Server), + advertisePeerPortToProxy: make(map[int]proxy.Server), } }