X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/70459cdae1f4e92789a14c1fecb66f5954a5aa7f..505c8fa50631201e289cc55230d46fdf52fa2055:/services/keep-web/server.go

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index f70dd1a71f..8f623c627d 100644
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -5,10 +5,14 @@
 package main
 
 import (
+	"context"
 	"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/ctxlog"
+	"git.arvados.org/arvados.git/sdk/go/httpserver"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/sirupsen/logrus"
 )
 
 type server struct {
@@ -16,13 +20,21 @@ 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
-	mh := httpserver.Instrument(reg, nil, httpserver.AddRequestIDs(httpserver.LogRequests(nil, h)))
-	h.MetricsAPI = mh.ServeAPI(h.Config.ManagementToken, http.NotFoundHandler())
+	ctx := ctxlog.Context(context.Background(), logger)
+	mh := httpserver.Instrument(reg, logger, 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()
 }