17464: Fix shadowed "sess" variable

Testing WIP

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index 350e95ce88ac3fb0eea1dfc1bf864bcaa68e292d..a52af804841fb58f4b837893ae83e3cb76d960b4 100644 (file)
--- a/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@ -225,7 +225,7 @@ func (c *cache) GetSession(token string) (arvados.CustomFileSystem, *cachedSessi
        expired := false
        if sess == nil {
                c.metrics.sessionMisses.Inc()
-               sess := &cachedSession{
+               sess = &cachedSession{
                        expire: now.Add(c.config.TTL.Duration()),
                }
                var err error

diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go
index 8715ab24f35c0312fcca8152dc464ab60aa582af..b8c7443f0c073c816f992d9e969d7f6de610f496 100644 (file)
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@ -1178,6 +1178,27 @@ func (s *IntegrationSuite) TestCacheWriteCollectionSamePDH(c *check.C) {
        checkWithID(colls[0].UUID, http.StatusOK)
 }
 
+// func (s *IntegrationSuite) TestUploadDownloadLogging(c *check.C) {
+//     u := mustParseURL("http://" + arvadostest.FooCollection + ".keep-web.example/foo")
+//     req := &http.Request{
+//             Method:     "GET",
+//             Host:       u.Host,
+//             URL:        u,
+//             RequestURI: u.RequestURI(),
+//             Header: http.Header{
+//                     "Authorization": {"Bearer " + arvadostest.ActiveToken},
+//             },
+//     }
+
+//     var logbuf bytes.Buffer
+//     logger := logrus.New()
+//     logger.Out = &logbuf
+//     req = req.WithContext(ctxlog.Context(context.Background(), logger))
+//     s.doReq(req)
+
+//     c.Check(logbuf.String(), check.Matches, `Download file*`)
+// }
+
 func copyHeader(h http.Header) http.Header {
        hc := http.Header{}
        for k, v := range h {