X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1fa33cf0c06e07c7f3668f994f8d0def93d5ecbd..b7ec820ac297bc316ef9ffa36242e7928acbc0b4:/services/keep-web/server.go

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index 28a9dde247..586f6b8057 100644
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -6,11 +6,12 @@ package main
 
 import (
 	"context"
+	"net"
 	"net/http"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
-	"git.curoverse.com/arvados.git/sdk/go/httpserver"
+	"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,18 +21,26 @@ type server struct {
 	Config *Config
 }
 
-func (srv *server) Start() error {
+func (srv *server) Start(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 ctxlog.Context(context.Background(), logger) }
 	var listen arvados.URL
 	for listen = range srv.Config.cluster.Services.WebDAV.InternalURLs {
 		break
 	}
+	if len(srv.Config.cluster.Services.WebDAV.InternalURLs) > 1 {
+		logrus.Warn("Services.WebDAV.InternalURLs has more than one key; picked: ", listen)
+	}
 	srv.Addr = listen.Host
 	return srv.Server.Start()
 }