X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f4ca9ad94a6bb006d1f3c7ba207837f1736d1247..bc14c62ad1528dbddc26781c5cea6a7968c93f2e:/services/keep-web/server.go

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index 100900830f..167fbbe5b8 100644
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -1,27 +1,32 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
-	"flag"
+	"context"
 	"net/http"
 
+	"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"
 )
 
-var address string
-
-func init() {
-	flag.StringVar(&address, "listen", ":80",
-		"Address to listen on: \"host:port\", or \":port\" to listen on all interfaces.")
-}
-
 type server struct {
 	httpserver.Server
+	Config *Config
 }
 
 func (srv *server) Start() error {
-	mux := http.NewServeMux()
-	mux.Handle("/", &handler{})
-	srv.Handler = mux
-	srv.Addr = address
+	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.ManagementToken, http.NotFoundHandler())
+	srv.Handler = mh
+	srv.Addr = srv.Config.Listen
 	return srv.Server.Start()
 }