+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
package main
import (
- "database/sql"
"encoding/json"
"io"
"net/http"
"sync/atomic"
"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"
)
DebugStatus() interface{}
}
-type sessionFactory func(wsConn, chan<- interface{}, *sql.DB, permChecker) (session, error)
-
func (rtr *router) setup() {
rtr.handler = &handler{
PingTimeout: rtr.Config.PingTimeout.Duration(),
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.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 {
stats := rtr.handler.Handle(ws, rtr.eventSource,
func(ws wsConn, sendq chan<- interface{}) (session, error) {
- return newSession(ws, sendq, rtr.eventSource.DB(), rtr.newPermChecker())
+ return newSession(ws, sendq, rtr.eventSource.DB(), rtr.newPermChecker(), &rtr.Config.Client)
})
log.WithFields(logrus.Fields{
- "Elapsed": time.Now().Sub(t0).Seconds(),
- "Stats": stats,
+ "elapsed": time.Now().Sub(t0).Seconds(),
+ "stats": stats,
}).Info("disconnect")
ws.Close()
}),
func (rtr *router) Status() interface{} {
return map[string]interface{}{
"Clients": atomic.LoadInt64(&rtr.status.ReqsActive),
+ "Version": version,
}
}
logger := logger(req.Context()).
WithField("RequestID", rtr.newReqID())
- ctx := contextWithLogger(req.Context(), logger)
+ ctx := ctxlog.Context(req.Context(), logger)
req = req.WithContext(ctx)
logger.WithFields(logrus.Fields{
- "RemoteAddr": req.RemoteAddr,
- "X-Forwarded-For": req.Header.Get("X-Forwarded-For"),
+ "remoteAddr": req.RemoteAddr,
+ "reqForwardedFor": req.Header.Get("X-Forwarded-For"),
}).Info("accept 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())
- 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)
}
- }
+ })
}