projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13493-federation-proxy'
[arvados.git]
/
services
/
keep-web
/
server.go
diff --git
a/services/keep-web/server.go
b/services/keep-web/server.go
index aed2989219cab297adcc0629c0162ae1f1610f36..58ec348c882b88e6c92116dca947bd24e62c5877 100644
(file)
--- a/
services/keep-web/server.go
+++ b/
services/keep-web/server.go
@@
-5,6
+5,8
@@
package main
import (
package main
import (
+ "net/http"
+
"git.curoverse.com/arvados.git/sdk/go/httpserver"
)
"git.curoverse.com/arvados.git/sdk/go/httpserver"
)
@@
-14,7
+16,10
@@
type server struct {
}
func (srv *server) Start() error {
}
func (srv *server) Start() error {
- srv.Handler = httpserver.AddRequestIDs(&handler{Config: srv.Config})
+ 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()
}
srv.Addr = srv.Config.Listen
return srv.Server.Start()
}