Merge branch '21535-multi-wf-delete'

[arvados.git] / services / ws / session_v0.go

diff --git a/services/ws/session_v0.go b/services/ws/session_v0.go
index b57abb5cac31b0d563528669514e3bdcee151327..98ec762147ac1a57c30ec70b0261affcf3644683 100644 (file)
--- a/services/ws/session_v0.go
+++ b/services/ws/session_v0.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package ws
 
 import (
        "database/sql"
@@ -13,8 +13,9 @@ import (
        "sync/atomic"
        "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "github.com/Sirupsen/logrus"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/ctxlog"
+       "github.com/sirupsen/logrus"
 )
 
 var (
@@ -29,6 +30,7 @@ var (
                "name",
                "owner_uuid",
                "portable_data_hash",
+               "requesting_container_uuid",
                "state",
        }
 
@@ -44,7 +46,7 @@ type v0session struct {
        permChecker   permChecker
        subscriptions []v0subscribe
        lastMsgID     uint64
-       log           *logrus.Entry
+       log           logrus.FieldLogger
        mtx           sync.Mutex
        setupOnce     sync.Once
 }
@@ -59,7 +61,7 @@ func newSessionV0(ws wsConn, sendq chan<- interface{}, db *sql.DB, pc permChecke
                db:          db,
                ac:          ac,
                permChecker: pc,
-               log:         logger(ws.Request().Context()),
+               log:         ctxlog.FromContext(ws.Request().Context()),
        }
 
        err := ws.Request().ParseForm()
@@ -128,7 +130,7 @@ func (sess *v0session) EventMessage(e *event) ([]byte, error) {
        } else {
                permTarget = detail.ObjectUUID
        }
-       ok, err := sess.permChecker.Check(permTarget)
+       ok, err := sess.permChecker.Check(sess.ws.Request().Context(), permTarget)
        if err != nil || !ok {
                return nil, err
        }
@@ -200,9 +202,9 @@ func (sub *v0subscribe) sendOldEvents(sess *v0session) {
                return
        }
 
-       var ids []uint64
+       var ids []int64
        for rows.Next() {
-               var id uint64
+               var id int64
                err := rows.Scan(&id)
                if err != nil {
                        sess.log.WithError(err).Error("sendOldEvents row Scan failed")