package main
import (
- "database/sql"
"encoding/json"
"io"
"net/http"
"sync/atomic"
"time"
+ "git.curoverse.com/arvados.git/sdk/go/ctxlog"
"github.com/Sirupsen/logrus"
"golang.org/x/net/websocket"
)
DebugStatus() interface{}
}
-type sessionFactory func(wsConn, chan<- interface{}, *sql.DB, permChecker) (session, error)
-
func (rtr *router) setup() {
rtr.handler = &handler{
PingTimeout: rtr.Config.PingTimeout.Duration(),
stats := rtr.handler.Handle(ws, rtr.eventSource,
func(ws wsConn, sendq chan<- interface{}) (session, error) {
- return newSession(ws, sendq, rtr.eventSource.DB(), rtr.newPermChecker())
+ return newSession(ws, sendq, rtr.eventSource.DB(), rtr.newPermChecker(), &rtr.Config.Client)
})
log.WithFields(logrus.Fields{
logger := logger(req.Context()).
WithField("RequestID", rtr.newReqID())
- ctx := contextWithLogger(req.Context(), logger)
+ ctx := ctxlog.Context(req.Context(), logger)
req = req.WithContext(ctx)
logger.WithFields(logrus.Fields{
"remoteAddr": req.RemoteAddr,