X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fe561d69b42d55191d6d1f01d4f3cdcf1fc9faaa..e0fd2e426856a6593f2c86c60831f0f867f4f83d:/services/keep-web/server.go diff --git a/services/keep-web/server.go b/services/keep-web/server.go index e51376c3bc..28a9dde247 100644 --- a/services/keep-web/server.go +++ b/services/keep-web/server.go @@ -5,7 +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 { @@ -14,7 +21,17 @@ type server struct { } func (srv *server) Start() error { - srv.Handler = httpserver.AddRequestIDs(httpserver.LogRequests(nil, &handler{Config: srv.Config})) - srv.Addr = srv.Config.Listen + h := &handler{Config: srv.Config} + 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 + var listen arvados.URL + for listen = range srv.Config.cluster.Services.WebDAV.InternalURLs { + break + } + srv.Addr = listen.Host return srv.Server.Start() }