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

diff --git a/services/keep-web/server.go b/services/keep-web/server.go
index 100900830f..58ec348c88 100644
--- a/services/keep-web/server.go
+++ b/services/keep-web/server.go
@@ -1,27 +1,25 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
-	"flag"
 	"net/http"
 
 	"git.curoverse.com/arvados.git/sdk/go/httpserver"
 )
 
-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}
+	mh := httpserver.Instrument(nil, httpserver.AddRequestIDs(httpserver.LogRequests(nil, h)))
+	h.MetricsAPI = mh.ServeAPI(http.NotFoundHandler())
+	srv.Handler = mh
+	srv.Addr = srv.Config.Listen
 	return srv.Server.Start()
 }