projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14366-crunch2-upgrade' refs #14366
[arvados.git]
/
services
/
arv-git-httpd
/
server.go
diff --git
a/services/arv-git-httpd/server.go
b/services/arv-git-httpd/server.go
index 40e77a812a6ff4c04a524ca76b819555b9e6e69e..8f0d90f89e29cad0a0d8d590b66e412b02195ad2 100644
(file)
--- a/
services/arv-git-httpd/server.go
+++ b/
services/arv-git-httpd/server.go
@@
-1,8
+1,13
@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
package main
import (
"net/http"
package main
import (
"net/http"
+ "git.curoverse.com/arvados.git/sdk/go/health"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
)
"git.curoverse.com/arvados.git/sdk/go/httpserver"
)
@@
-12,8
+17,12
@@
type server struct {
func (srv *server) Start() error {
mux := http.NewServeMux()
func (srv *server) Start() error {
mux := http.NewServeMux()
- mux.Handle("/", &authHandler{newGitHandler()})
+ mux.Handle("/", &authHandler{handler: newGitHandler()})
+ mux.Handle("/_health/", &health.Handler{
+ Token: theConfig.ManagementToken,
+ Prefix: "/_health/",
+ })
srv.Handler = mux
srv.Handler = mux
- srv.Addr = theConfig.
Addr
+ srv.Addr = theConfig.
Listen
return srv.Server.Start()
}
return srv.Server.Start()
}