X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7653054635e3f4f84da3f2b6862cd2c02fbe3fd4..eb0b1549382d941503b6a5d205250e50c7ab473d:/services/keep-web/server.go diff --git a/services/keep-web/server.go b/services/keep-web/server.go index 167fbbe5b8..b81c251753 100644 --- a/services/keep-web/server.go +++ b/services/keep-web/server.go @@ -8,6 +8,7 @@ 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" @@ -25,8 +26,15 @@ func (srv *server) Start() error { 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.ManagementToken, http.NotFoundHandler()) + 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() }