18348: Add ClusterID field to service log entries.

[arvados.git] / services / keep-web / server.go

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index 586f6b805736e23437357dbc8eb1a8cf4b5a5cc7..24f1b77be238bd188b482a9beb678e1b7dfc812f 100644 (file)
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -10,7 +10,6 @@ import (
        "net/http"
 
        "git.arvados.org/arvados.git/sdk/go/arvados"
-       "git.arvados.org/arvados.git/sdk/go/ctxlog"
        "git.arvados.org/arvados.git/sdk/go/httpserver"
        "github.com/prometheus/client_golang/prometheus"
        "github.com/sirupsen/logrus"
@@ -21,7 +20,7 @@ type server struct {
        Config *Config
 }
 
-func (srv *server) Start(logger *logrus.Logger) error {
+func (srv *server) Start(ctx context.Context, logger *logrus.Logger) error {
        h := &handler{Config: srv.Config}
        reg := prometheus.NewRegistry()
        h.Config.Cache.registry = reg
@@ -33,7 +32,7 @@ func (srv *server) Start(logger *logrus.Logger) error {
        mh := httpserver.Instrument(reg, logger, httpserver.AddRequestIDs(httpserver.LogRequests(h)))
        h.MetricsAPI = mh.ServeAPI(h.Config.cluster.ManagementToken, http.NotFoundHandler())
        srv.Handler = mh
-       srv.BaseContext = func(net.Listener) context.Context { return ctxlog.Context(context.Background(), logger) }
+       srv.BaseContext = func(net.Listener) context.Context { return ctx }
        var listen arvados.URL
        for listen = range srv.Config.cluster.Services.WebDAV.InternalURLs {
                break