reuse dialClient in redriector

server/api/redirector.go

@@ -14,7 +14,6 @@
 package api
 
 import (
-	"crypto/tls"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -68,26 +67,17 @@ func (h *redirector) ServeHTTP(w http.ResponseWriter, r *http.Request, next http
 		return
 	}
 
-	tlsConfig, err := h.s.GetSecurityConfig().ToTLSConfig()
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	newCustomReverseProxies(urls, tlsConfig).ServeHTTP(w, r)
+	newCustomReverseProxies(urls).ServeHTTP(w, r)
 }
 
 type customReverseProxies struct {
 	urls   []url.URL
 	client *http.Client
 }
 
-func newCustomReverseProxies(urls []url.URL, tlsConfig *tls.Config) *customReverseProxies {
+func newCustomReverseProxies(urls []url.URL) *customReverseProxies {
 	p := &customReverseProxies{
-		client: &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: tlsConfig,
-			},
-		},
+		client: dialClient,
 	}
 
 	p.urls = append(p.urls, urls...)

server/api/server.go

@@ -24,6 +24,8 @@ import (
 
 const apiPrefix = "/pd"
 
+var dialClient = &http.Client{}
+
 // NewHandler creates a HTTP handler for API.
 func NewHandler(svr *server.Server) http.Handler {
 	engine := negroni.New()
@@ -49,8 +51,9 @@ func InitHTTPClient(svr *server.Server) error {
 		return errors.Trace(err)
 	}
 
-	client = &http.Client{Transport: &http.Transport{
-		TLSClientConfig: tlsConfig,
+	dialClient = &http.Client{Transport: &http.Transport{
+		TLSClientConfig:   tlsConfig,
+		DisableKeepAlives: true,
 	}}
 	return nil
 }

server/api/util.go

@@ -23,8 +23,6 @@ import (
 	"github.com/juju/errors"
 )
 
-var client = &http.Client{}
-
 func readJSON(r io.ReadCloser, data interface{}) error {
 	defer r.Close()
 
@@ -41,7 +39,7 @@ func readJSON(r io.ReadCloser, data interface{}) error {
 }
 
 func postJSON(url string, data []byte) error {
-	resp, err := client.Post(url, "application/json", bytes.NewBuffer(data))
+	resp, err := dialClient.Post(url, "application/json", bytes.NewBuffer(data))
 	if err != nil {
 		return errors.Trace(err)
 	}
@@ -61,7 +59,7 @@ func doDelete(url string) error {
 	if err != nil {
 		return err
 	}
-	res, err := client.Do(req)
+	res, err := dialClient.Do(req)
 	if err != nil {
 		return err
 	}
@@ -74,7 +72,7 @@ func doGet(url string) (*http.Response, error) {
 	if err != nil {
 		return nil, err
 	}
-	resp, err := client.Do(req)
+	resp, err := dialClient.Do(req)
 	if err != nil {
 		return nil, errors.Trace(err)
 	}