Merge branch '13851-wb-multisite-search'

[arvados.git] / lib / controller / handler.go

diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index 69b1866162c6fe1488ba3ca0b76d92817a4658ef..25799aae9ea30d3116469e205c77f927c313172a 100644 (file)
--- a/lib/controller/handler.go
+++ b/lib/controller/handler.go
@@ -58,6 +58,8 @@ func (h *Handler) CheckHealth() error {
        return err
 }
 
+func neverRedirect(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }
+
 func (h *Handler) setup() {
        mux := http.NewServeMux()
        mux.Handle("/_health/", &health.Handler{
@@ -72,21 +74,18 @@ func (h *Handler) setup() {
 
        sc := *arvados.DefaultSecureClient
        sc.Timeout = time.Duration(h.Cluster.HTTPRequestTimeout)
+       sc.CheckRedirect = neverRedirect
        h.secureClient = &sc
 
        ic := *arvados.InsecureHTTPClient
        ic.Timeout = time.Duration(h.Cluster.HTTPRequestTimeout)
+       ic.CheckRedirect = neverRedirect
        h.insecureClient = &ic
 
        h.proxy = &proxy{
                Name:           "arvados-controller",
                RequestTimeout: time.Duration(h.Cluster.HTTPRequestTimeout),
        }
-
-       // Changing the global isn't the right way to do this, but a
-       // proper solution would conflict with an impending 13493
-       // merge anyway, so this will do for now.
-       arvados.InsecureHTTPClient.CheckRedirect = func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }
 }
 
 var errDBConnection = errors.New("database connection error")