16217: Exit service command if the service handler fails.

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

diff --git a/services/ws/router.go b/services/ws/router.go
index 987c225eac8ba5a456aa0c2af2e7f56eede749be..b3403dabd00a3740d87f3136a21076ac4640fdc1 100644 (file)
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package ws
 
 import (
        "encoding/json"
@@ -13,9 +13,11 @@ import (
        "sync/atomic"
        "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/ctxlog"
-       "git.curoverse.com/arvados.git/sdk/go/health"
-       "github.com/Sirupsen/logrus"
+       "git.arvados.org/arvados.git/lib/cmd"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/ctxlog"
+       "git.arvados.org/arvados.git/sdk/go/health"
+       "github.com/sirupsen/logrus"
        "golang.org/x/net/websocket"
 )
 
@@ -27,13 +29,15 @@ type wsConn interface {
 }
 
 type router struct {
-       Config         *wsConfig
+       client         *arvados.Client
+       cluster        *arvados.Cluster
        eventSource    eventSource
        newPermChecker func() permChecker
 
        handler   *handler
        mux       *http.ServeMux
        setupOnce sync.Once
+       done      chan struct{}
 
        lastReqID  int64
        lastReqMtx sync.Mutex
@@ -52,8 +56,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))
@@ -62,14 +66,14 @@ func (rtr *router) setup() {
        rtr.mux.Handle("/status.json", rtr.jsonHandler(rtr.Status))
 
        rtr.mux.Handle("/_health/", &health.Handler{
-               Token:  rtr.Config.ManagementToken,
+               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")
+                               ctxlog.FromContext(r.Context()).WithError(err).Error("error")
                        }
                },
        })
@@ -82,15 +86,15 @@ func (rtr *router) makeServer(newSession sessionFactory) *websocket.Server {
                },
                Handler: websocket.Handler(func(ws *websocket.Conn) {
                        t0 := time.Now()
-                       log := logger(ws.Request().Context())
-                       log.Info("connected")
+                       logger := ctxlog.FromContext(ws.Request().Context())
+                       logger.Info("connected")
 
-                       stats := rtr.handler.Handle(ws, rtr.eventSource,
+                       stats := rtr.handler.Handle(ws, logger, 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{
+                       logger.WithFields(logrus.Fields{
                                "elapsed": time.Now().Sub(t0).Seconds(),
                                "stats":   stats,
                        }).Info("disconnect")
@@ -123,7 +127,7 @@ func (rtr *router) DebugStatus() interface{} {
 func (rtr *router) Status() interface{} {
        return map[string]interface{}{
                "Clients": atomic.LoadInt64(&rtr.status.ReqsActive),
-               "Version": version,
+               "Version": cmd.Version.String(),
        }
 }
 
@@ -133,7 +137,7 @@ func (rtr *router) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
        atomic.AddInt64(&rtr.status.ReqsActive, 1)
        defer atomic.AddInt64(&rtr.status.ReqsActive, -1)
 
-       logger := logger(req.Context()).
+       logger := ctxlog.FromContext(req.Context()).
                WithField("RequestID", rtr.newReqID())
        ctx := ctxlog.Context(req.Context(), logger)
        req = req.WithContext(ctx)
@@ -146,7 +150,7 @@ func (rtr *router) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 
 func (rtr *router) jsonHandler(fn func() interface{}) http.Handler {
        return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-               logger := logger(r.Context())
+               logger := ctxlog.FromContext(r.Context())
                w.Header().Set("Content-Type", "application/json")
                enc := json.NewEncoder(w)
                err := enc.Encode(fn())
@@ -157,3 +161,12 @@ func (rtr *router) jsonHandler(fn func() interface{}) http.Handler {
                }
        })
 }
+
+func (rtr *router) CheckHealth() error {
+       rtr.setupOnce.Do(rtr.setup)
+       return rtr.eventSource.DBHealth()
+}
+
+func (rtr *router) Done() <-chan struct{} {
+       return rtr.done
+}