X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/34b6ae3f6c8204f87a9498d00f7ebe2b10cda170..2d046e6afeb13988d1438a05301d60a5d399a371:/services/keepproxy/keepproxy.go diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go index a79883147b..39ffd45cbe 100644 --- a/services/keepproxy/keepproxy.go +++ b/services/keepproxy/keepproxy.go @@ -304,7 +304,6 @@ func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) { var err error var status int var expectLength, responseLength int64 - var proxiedURI = "-" logger := ctxlog.FromContext(req.Context()) defer func() { @@ -312,7 +311,6 @@ func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) { "locator": locator, "expectLength": expectLength, "responseLength": responseLength, - "proxiedURI": proxiedURI, "err": err, }) if status != http.StatusOK { @@ -321,6 +319,7 @@ func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) { }() kc := h.makeKeepClient(req) + kc.DiskCacheSize = keepclient.DiskCacheDisabled var pass bool var tok string @@ -345,9 +344,9 @@ func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) { switch req.Method { case "HEAD": - expectLength, proxiedURI, err = kc.Ask(locator) + expectLength, _, err = kc.Ask(locator) case "GET": - reader, expectLength, proxiedURI, err = kc.Get(locator) + reader, expectLength, _, err = kc.Get(locator) if reader != nil { defer reader.Close() }