X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/443a0b96316ed46600dc5035193adae6ac4d1f74..d9c447c1a53c03493fb1dd51a8eeb3f0022d07d5:/services/ws/session_v0.go

diff --git a/services/ws/session_v0.go b/services/ws/session_v0.go
index 7bd1498158..66bc6ac7fa 100644
--- 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,7 +13,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	"github.com/sirupsen/logrus"
 )
 
@@ -44,7 +45,7 @@ type v0session struct {
 	permChecker   permChecker
 	subscriptions []v0subscribe
 	lastMsgID     uint64
-	log           *logrus.Entry
+	log           logrus.FieldLogger
 	mtx           sync.Mutex
 	setupOnce     sync.Once
 }
@@ -59,7 +60,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 +129,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 +201,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")