Merge branch '18947-githttpd'

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

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index 46dc3d30179343e29edea208588103fe947c3c08..24f1b77be238bd188b482a9beb678e1b7dfc812f 100644 (file)
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -6,10 +6,10 @@ package main
 
 import (
        "context"
+       "net"
        "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"
@@ -20,14 +20,19 @@ type server struct {
        Config *Config
 }
 
-func (srv *server) Start() 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
-       ctx := ctxlog.Context(context.Background(), logrus.StandardLogger())
-       mh := httpserver.Instrument(reg, nil, httpserver.HandlerWithContext(ctx, httpserver.AddRequestIDs(httpserver.LogRequests(h))))
+       // Warning: when updating this to use Command() from
+       // lib/service, make sure to implement an exemption in
+       // httpserver.HandlerWithDeadline() so large file uploads are
+       // allowed to take longer than the usual API.RequestTimeout.
+       // See #13697.
+       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 ctx }
        var listen arvados.URL
        for listen = range srv.Config.cluster.Services.WebDAV.InternalURLs {
                break