X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9cc572d6a44262e21251372e28b549cfc09e681a..e9bfb6900e3340bfcdcea691466cd849ca7d9ffc:/services/keep-web/server.go?ds=sidebyside

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index 58ec348c88..b81c251753 100644
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -5,9 +5,14 @@
 package main
 
 import (
+	"context"
 	"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"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/sirupsen/logrus"
 )
 
 type server struct {
@@ -17,9 +22,19 @@ type server struct {
 
 func (srv *server) Start() 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
+	ctx := ctxlog.Context(context.Background(), logrus.StandardLogger())
+	mh := httpserver.Instrument(reg, nil, httpserver.HandlerWithContext(ctx, httpserver.AddRequestIDs(httpserver.LogRequests(h))))
+	h.MetricsAPI = mh.ServeAPI(h.Config.cluster.ManagementToken, http.NotFoundHandler())
 	srv.Handler = mh
-	srv.Addr = srv.Config.Listen
+	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()
 }