16314: Merge branch 'master'

[arvados.git] / services / keep-web / server.go

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index babc68b6b59d37a14f17ac26f8cc49dc1485b4ca..8f623c627d067f843f2746a2b8b64248006b1a18 100644 (file)
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -1,7 +1,18 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
-       "git.curoverse.com/arvados.git/sdk/go/httpserver"
+       "context"
+       "net/http"
+
+       "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 {
@@ -9,8 +20,21 @@ type server struct {
        Config *Config
 }
 
-func (srv *server) Start() error {
-       srv.Handler = &handler{Config: srv.Config}
-       srv.Addr = srv.Config.Listen
+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(), 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
+       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()
 }