Merge branch '15640-cwl-test-mem' refs #15640

[arvados.git] / services / ws / router.go

diff --git a/services/ws/router.go b/services/ws/router.go
index 3f3a051d8eba54e8574416290ba71f8777f47b30..14dc63ec37b12d5524885f476a6912643847ce1c 100644 (file)
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -13,8 +13,10 @@ import (
        "sync/atomic"
        "time"
 
+       "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/ctxlog"
-       "github.com/Sirupsen/logrus"
+       "git.curoverse.com/arvados.git/sdk/go/health"
+       "github.com/sirupsen/logrus"
        "golang.org/x/net/websocket"
 )
 
@@ -26,7 +28,8 @@ type wsConn interface {
 }
 
 type router struct {
-       Config         *wsConfig
+       client         arvados.Client
+       cluster        *arvados.Cluster
        eventSource    eventSource
        newPermChecker func() permChecker
 
@@ -51,8 +54,8 @@ type debugStatuser interface {
 
 func (rtr *router) setup() {
        rtr.handler = &handler{
-               PingTimeout: rtr.Config.PingTimeout.Duration(),
-               QueueSize:   rtr.Config.ClientEventQueue,
+               PingTimeout: time.Duration(rtr.cluster.API.SendTimeout),
+               QueueSize:   rtr.cluster.API.WebsocketClientEventQueue,
        }
        rtr.mux = http.NewServeMux()
        rtr.mux.Handle("/websocket", rtr.makeServer(newSessionV0))
@@ -60,10 +63,18 @@ func (rtr *router) setup() {
        rtr.mux.Handle("/debug.json", rtr.jsonHandler(rtr.DebugStatus))
        rtr.mux.Handle("/status.json", rtr.jsonHandler(rtr.Status))
 
-       health := http.NewServeMux()
-       rtr.mux.Handle("/_health/", rtr.mgmtAuth(health))
-       health.Handle("/_health/ping", rtr.jsonHandler(rtr.HealthFunc(func() error { return nil })))
-       health.Handle("/_health/db", rtr.jsonHandler(rtr.HealthFunc(rtr.eventSource.DBHealth)))
+       rtr.mux.Handle("/_health/", &health.Handler{
+               Token:  rtr.cluster.ManagementToken,
+               Prefix: "/_health/",
+               Routes: health.Routes{
+                       "db": rtr.eventSource.DBHealth,
+               },
+               Log: func(r *http.Request, err error) {
+                       if err != nil {
+                               logger(r.Context()).WithError(err).Error("error")
+                       }
+               },
+       })
 }
 
 func (rtr *router) makeServer(newSession sessionFactory) *websocket.Server {
@@ -78,7 +89,7 @@ func (rtr *router) makeServer(newSession sessionFactory) *websocket.Server {
 
                        stats := rtr.handler.Handle(ws, rtr.eventSource,
                                func(ws wsConn, sendq chan<- interface{}) (session, error) {
-                                       return newSession(ws, sendq, rtr.eventSource.DB(), rtr.newPermChecker(), &rtr.Config.Client)
+                                       return newSession(ws, sendq, rtr.eventSource.DB(), rtr.newPermChecker(), &rtr.client)
                                })
 
                        log.WithFields(logrus.Fields{
@@ -111,24 +122,10 @@ func (rtr *router) DebugStatus() interface{} {
        return s
 }
 
-var pingResponseOK = map[string]string{"health": "OK"}
-
-func (rtr *router) HealthFunc(f func() error) func() interface{} {
-       return func() interface{} {
-               err := f()
-               if err == nil {
-                       return pingResponseOK
-               }
-               return map[string]string{
-                       "health": "ERROR",
-                       "error":  err.Error(),
-               }
-       }
-}
-
 func (rtr *router) Status() interface{} {
        return map[string]interface{}{
                "Clients": atomic.LoadInt64(&rtr.status.ReqsActive),
+               "Version": version,
        }
 }
 
@@ -149,20 +146,6 @@ func (rtr *router) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
        rtr.mux.ServeHTTP(resp, req)
 }
 
-func (rtr *router) mgmtAuth(h http.Handler) http.Handler {
-       return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-               if rtr.Config.ManagementToken == "" {
-                       http.Error(w, "disabled", http.StatusNotFound)
-               } else if ah := r.Header.Get("Authorization"); ah == "" {
-                       http.Error(w, "authorization required", http.StatusUnauthorized)
-               } else if ah != "Bearer "+rtr.Config.ManagementToken {
-                       http.Error(w, "authorization error", http.StatusForbidden)
-               } else {
-                       h.ServeHTTP(w, r)
-               }
-       })
-}
-
 func (rtr *router) jsonHandler(fn func() interface{}) http.Handler {
        return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
                logger := logger(r.Context())