X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f9f0960543c846af8054832c22371c9bc6734615..28aa75d2683d5f0472335ecef3b2ff505e72f30d:/services/keep-web/cache.go

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index 604efd29d9..b5b6cc4fa5 100644
--- a/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@ -179,6 +179,7 @@ func (c *cache) checkout(token string) (*cachedSession, error) {
 		}
 		client.AuthToken = token
 		client.Timeout = time.Minute
+		client.Logger = c.logger
 		// A non-empty origin header tells controller to
 		// prioritize our traffic as interactive, which is
 		// true most of the time.
@@ -188,11 +189,13 @@ func (c *cache) checkout(token string) (*cachedSession, error) {
 		if err != nil {
 			return nil, err
 		}
+		kc := keepclient.New(arvadosclient)
+		kc.DiskCacheSize = c.cluster.Collections.WebDAVCache.DiskCacheSize
 		sess = &cachedSession{
 			cache:         c,
 			client:        client,
 			arvadosclient: arvadosclient,
-			keepclient:    keepclient.New(arvadosclient),
+			keepclient:    kc,
 		}
 		c.sessions[token] = sess
 	}
@@ -221,7 +224,7 @@ func (c *cache) GetSession(token string) (arvados.CustomFileSystem, *cachedSessi
 		// using the new fs).
 		sess.inuse.Lock()
 		if !sess.userLoaded || refresh {
-			err := sess.client.RequestAndDecode(&sess.user, "GET", "/arvados/v1/users/current", nil, nil)
+			err := sess.client.RequestAndDecode(&sess.user, "GET", "arvados/v1/users/current", nil, nil)
 			if he := errorWithHTTPStatus(nil); errors.As(err, &he) && he.HTTPStatus() == http.StatusForbidden {
 				// token is OK, but "get user id" api is out
 				// of scope -- use existing/expired info if
@@ -303,7 +306,7 @@ func (c *cache) pruneSessions() {
 	// Mark more sessions for deletion until reaching desired
 	// memory size limit, starting with the oldest entries.
 	for i, snap := range snaps {
-		if size <= c.cluster.Collections.WebDAVCache.MaxCollectionBytes {
+		if size <= int64(c.cluster.Collections.WebDAVCache.MaxCollectionBytes) {
 			break
 		}
 		if snap.prune {