X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2a1978f10b7dff4f239eb868648f404f070fccc3..abd90a9194482bb75b471afc0f11fba8bce786c7:/services/ws/router.go

diff --git a/services/ws/router.go b/services/ws/router.go
index 0ad8d7c088..15b825f2ab 100644
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"database/sql"
 	"encoding/json"
 	"io"
 	"net/http"
@@ -10,6 +9,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
 	"github.com/Sirupsen/logrus"
 	"golang.org/x/net/websocket"
 )
@@ -45,8 +45,6 @@ type debugStatuser interface {
 	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(),
@@ -71,7 +69,7 @@ func (rtr *router) makeServer(newSession sessionFactory) *websocket.Server {
 
 			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{
@@ -118,7 +116,7 @@ func (rtr *router) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 
 	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,