projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '21037-upgrade-react-scripts'
[arvados.git]
/
services
/
ws
/
session_v0.go
diff --git
a/services/ws/session_v0.go
b/services/ws/session_v0.go
index 63bdb49e5b6ad8675b26077deba8e29ead2e5b0f..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
//
// SPDX-License-Identifier: AGPL-3.0
-package
main
+package
ws
import (
"database/sql"
import (
"database/sql"
@@
-13,7
+13,8
@@
import (
"sync/atomic"
"time"
"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"
)
"github.com/sirupsen/logrus"
)
@@
-29,6
+30,7
@@
var (
"name",
"owner_uuid",
"portable_data_hash",
"name",
"owner_uuid",
"portable_data_hash",
+ "requesting_container_uuid",
"state",
}
"state",
}
@@
-59,7
+61,7
@@
func newSessionV0(ws wsConn, sendq chan<- interface{}, db *sql.DB, pc permChecke
db: db,
ac: ac,
permChecker: pc,
db: db,
ac: ac,
permChecker: pc,
- log:
logger
(ws.Request().Context()),
+ log:
ctxlog.FromContext
(ws.Request().Context()),
}
err := ws.Request().ParseForm()
}
err := ws.Request().ParseForm()
@@
-128,7
+130,7
@@
func (sess *v0session) EventMessage(e *event) ([]byte, error) {
} else {
permTarget = detail.ObjectUUID
}
} 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
}
if err != nil || !ok {
return nil, err
}
@@
-200,9
+202,9
@@
func (sub *v0subscribe) sendOldEvents(sess *v0session) {
return
}
return
}
- var ids []
u
int64
+ var ids []int64
for rows.Next() {
for rows.Next() {
- var id
u
int64
+ var id int64
err := rows.Scan(&id)
if err != nil {
sess.log.WithError(err).Error("sendOldEvents row Scan failed")
err := rows.Scan(&id)
if err != nil {
sess.log.WithError(err).Error("sendOldEvents row Scan failed")