projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12061-nm-integration-tests'
[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 c3c36dac5a5cc6c5dd21d852f398f3a927115ba7..8f0d90f89e29cad0a0d8d590b66e412b02195ad2 100644
(file)
--- a/
services/arv-git-httpd/server.go
+++ b/
services/arv-git-httpd/server.go
@@
-1,9
+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"
- "net/http/cgi"
+ "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,19
+16,13
@@
type server struct {
}
func (srv *server) Start() error {
}
func (srv *server) Start() error {
- gitHandler := &cgi.Handler{
- Path: theConfig.GitCommand,
- Dir: theConfig.Root,
- Env: []string{
- "GIT_PROJECT_ROOT=" + theConfig.Root,
- "GIT_HTTP_EXPORT_ALL=",
- },
- InheritEnv: []string{"PATH"},
- Args: []string{"http-backend"},
- }
mux := http.NewServeMux()
mux := http.NewServeMux()
- mux.Handle("/", &authHandler{gitHandler})
+ 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()
}