Merge branch '21535-multi-wf-delete'

[arvados.git] / services / keep-web / cache.go

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index df5705ed326aa32f4dce2ee1969c1190f8507c6f..b5b6cc4fa508cf25b8a388b490afef23dd12c239 100644 (file)
--- 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
        }
@@ -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 {