Merge branch '10669-safe-http-cache'

[arvados.git] / services / ws / router.go

diff --git a/services/ws/router.go b/services/ws/router.go
index 974459f760797df2c101416dca9665ea4e2f92a1..15b825f2abfa293f8ba2734f57508ba9306a03af 100644 (file)
--- 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,12 +69,12 @@ 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{
-                               "Elapsed": time.Now().Sub(t0).Seconds(),
-                               "Stats":   stats,
+                               "elapsed": time.Now().Sub(t0).Seconds(),
+                               "stats":   stats,
                        }).Info("disconnect")
                        ws.Close()
                }),
@@ -118,11 +116,11 @@ 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,
-               "X-Forwarded-For": req.Header.Get("X-Forwarded-For"),
+               "remoteAddr":      req.RemoteAddr,
+               "reqForwardedFor": req.Header.Get("X-Forwarded-For"),
        }).Info("accept request")
        rtr.mux.ServeHTTP(resp, req)
 }