projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15531: Add README
[arvados.git]
/
lib
/
controller
/
handler.go
diff --git
a/lib/controller/handler.go
b/lib/controller/handler.go
index 2c3ce1d4f28d189e956cd3e120b8433214861619..f7b2362f371e71b99a196d4b795e54a927e81919 100644
(file)
--- a/
lib/controller/handler.go
+++ b/
lib/controller/handler.go
@@
-15,6
+15,9
@@
import (
"sync"
"time"
"sync"
"time"
+ "git.curoverse.com/arvados.git/lib/controller/federation"
+ "git.curoverse.com/arvados.git/lib/controller/railsproxy"
+ "git.curoverse.com/arvados.git/lib/controller/router"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/health"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/health"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
@@
-60,7
+63,7
@@
func (h *Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
func (h *Handler) CheckHealth() error {
h.setupOnce.Do(h.setup)
func (h *Handler) CheckHealth() error {
h.setupOnce.Do(h.setup)
- _, _, err :=
f
indRailsAPI(h.Cluster)
+ _, _, err :=
railsproxy.F
indRailsAPI(h.Cluster)
return err
}
return err
}
@@
-73,6
+76,15
@@
func (h *Handler) setup() {
Prefix: "/_health/",
Routes: health.Routes{"ping": func() error { _, err := h.db(&http.Request{}); return err }},
})
Prefix: "/_health/",
Routes: health.Routes{"ping": func() error { _, err := h.db(&http.Request{}); return err }},
})
+
+ rtr := router.New(federation.New(h.Cluster))
+ mux.Handle("/arvados/v1/config", rtr)
+
+ if h.Cluster.EnableBetaController14287 {
+ mux.Handle("/arvados/v1/collections", rtr)
+ mux.Handle("/arvados/v1/collections/", rtr)
+ }
+
hs := http.NotFoundHandler()
hs = prepend(hs, h.proxyRailsAPI)
hs = h.setupProxyRemoteCluster(hs)
hs := http.NotFoundHandler()
hs = prepend(hs, h.proxyRailsAPI)
hs = h.setupProxyRemoteCluster(hs)
@@
-126,7
+138,7
@@
func prepend(next http.Handler, middleware middlewareFunc) http.Handler {
}
func (h *Handler) localClusterRequest(req *http.Request) (*http.Response, error) {
}
func (h *Handler) localClusterRequest(req *http.Request) (*http.Response, error) {
- urlOut, insecure, err :=
f
indRailsAPI(h.Cluster)
+ urlOut, insecure, err :=
railsproxy.F
indRailsAPI(h.Cluster)
if err != nil {
return nil, err
}
if err != nil {
return nil, err
}