X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7800f12fccea5675d71159ddf7c868f4074f8f56..fed9f70cdc99a3bc94a54bf1d182b13204a597be:/services/ws/router.go

diff --git a/services/ws/router.go b/services/ws/router.go
index b2c94e7109..987c225eac 100644
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -10,6 +14,7 @@ import (
 	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
+	"git.curoverse.com/arvados.git/sdk/go/health"
 	"github.com/Sirupsen/logrus"
 	"golang.org/x/net/websocket"
 )
@@ -53,10 +58,21 @@ func (rtr *router) setup() {
 	rtr.mux = http.NewServeMux()
 	rtr.mux.Handle("/websocket", rtr.makeServer(newSessionV0))
 	rtr.mux.Handle("/arvados/v1/events.ws", rtr.makeServer(newSessionV1))
-	rtr.mux.HandleFunc("/debug.json", jsonHandler(rtr.DebugStatus))
-	rtr.mux.HandleFunc("/status.json", jsonHandler(rtr.Status))
-	rtr.mux.HandleFunc("/_health/ping", jsonHandler(rtr.HealthFunc(func() error { return nil })))
-	rtr.mux.HandleFunc("/_health/db", jsonHandler(rtr.HealthFunc(rtr.eventSource.DBHealth)))
+	rtr.mux.Handle("/debug.json", rtr.jsonHandler(rtr.DebugStatus))
+	rtr.mux.Handle("/status.json", rtr.jsonHandler(rtr.Status))
+
+	rtr.mux.Handle("/_health/", &health.Handler{
+		Token:  rtr.Config.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 {
@@ -104,24 +120,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,
 	}
 }
 
@@ -142,16 +144,16 @@ func (rtr *router) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 	rtr.mux.ServeHTTP(resp, req)
 }
 
-func jsonHandler(fn func() interface{}) http.HandlerFunc {
-	return func(resp http.ResponseWriter, req *http.Request) {
-		logger := logger(req.Context())
-		resp.Header().Set("Content-Type", "application/json")
-		enc := json.NewEncoder(resp)
+func (rtr *router) jsonHandler(fn func() interface{}) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		logger := logger(r.Context())
+		w.Header().Set("Content-Type", "application/json")
+		enc := json.NewEncoder(w)
 		err := enc.Encode(fn())
 		if err != nil {
 			msg := "encode failed"
 			logger.WithError(err).Error(msg)
-			http.Error(resp, msg, http.StatusInternalServerError)
+			http.Error(w, msg, http.StatusInternalServerError)
 		}
-	}
+	})
 }