projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17521-dot-slash-glob' refs #17521
[arvados.git]
/
services
/
ws
/
session_v0.go
diff --git
a/services/ws/session_v0.go
b/services/ws/session_v0.go
index 7bd1498158304ea3ab8a969c0c90129241ab1028..309352b39edbd329aa031ec0c6194791341acec9 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"
)
@@
-44,7
+45,7
@@
type v0session struct {
permChecker permChecker
subscriptions []v0subscribe
lastMsgID uint64
permChecker permChecker
subscriptions []v0subscribe
lastMsgID uint64
- log
*logrus.Entry
+ log
logrus.FieldLogger
mtx sync.Mutex
setupOnce sync.Once
}
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,
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
+129,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
}