X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bef56b9a22efac9ce73006623080e84a0b57f243..ae92d144610446849eb568247a44f02ae985c281:/services/keep-web/server.go

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index 58ec348c88..24f1b77be2 100644
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -5,9 +5,14 @@
 package main
 
 import (
+	"context"
+	"net"
 	"net/http"
 
-	"git.curoverse.com/arvados.git/sdk/go/httpserver"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/httpserver"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/sirupsen/logrus"
 )
 
 type server struct {
@@ -15,11 +20,26 @@ 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}
-	mh := httpserver.Instrument(nil, httpserver.AddRequestIDs(httpserver.LogRequests(nil, h)))
-	h.MetricsAPI = mh.ServeAPI(http.NotFoundHandler())
+	reg := prometheus.NewRegistry()
+	h.Config.Cache.registry = reg
+	// 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.Addr = srv.Config.Listen
+	srv.BaseContext = func(net.Listener) context.Context { return ctx }
+	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()
 }