X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/83f085a0c405695d9840a0542eb9746e7b5d3f6f..a58e9ca25aaa0963545f256985eb75b2f840e80f:/services/ws/router.go

diff --git a/services/ws/router.go b/services/ws/router.go
index e829ce88d7..15b825f2ab 100644
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -2,59 +2,139 @@ package main
 
 import (
 	"encoding/json"
-	"fmt"
-	"log"
+	"io"
 	"net/http"
+	"strconv"
 	"sync"
+	"sync/atomic"
+	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
+	"github.com/Sirupsen/logrus"
 	"golang.org/x/net/websocket"
 )
 
+type wsConn interface {
+	io.ReadWriter
+	Request() *http.Request
+	SetReadDeadline(time.Time) error
+	SetWriteDeadline(time.Time) error
+}
+
 type router struct {
-	Config *Config
+	Config         *wsConfig
+	eventSource    eventSource
+	newPermChecker func() permChecker
+
+	handler   *handler
+	mux       *http.ServeMux
+	setupOnce sync.Once
+
+	lastReqID  int64
+	lastReqMtx sync.Mutex
 
-	eventSource eventSource
-	mux         *http.ServeMux
-	setupOnce   sync.Once
+	status routerDebugStatus
 }
 
-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))
+type routerDebugStatus struct {
+	ReqsReceived int64
+	ReqsActive   int64
+}
+
+type debugStatuser interface {
+	DebugStatus() interface{}
 }
 
-func (rtr *router) makeServer(newSession func(wsConn, arvados.Client) (session, error)) *websocket.Server {
-	handler := &handler{
-		Client:      rtr.Config.Client,
+func (rtr *router) setup() {
+	rtr.handler = &handler{
 		PingTimeout: rtr.Config.PingTimeout.Duration(),
 		QueueSize:   rtr.Config.ClientEventQueue,
-		NewSession:  newSession,
 	}
+	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))
+}
+
+func (rtr *router) makeServer(newSession sessionFactory) *websocket.Server {
 	return &websocket.Server{
 		Handshake: func(c *websocket.Config, r *http.Request) error {
 			return nil
 		},
 		Handler: websocket.Handler(func(ws *websocket.Conn) {
-			log.Printf("%v accepted", ws.Request().RemoteAddr)
-			sink := rtr.eventSource.NewSink()
-			handler.Handle(ws, sink.Channel())
-			sink.Stop()
+			t0 := time.Now()
+			log := logger(ws.Request().Context())
+			log.Info("connected")
+
+			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)
+				})
+
+			log.WithFields(logrus.Fields{
+				"elapsed": time.Now().Sub(t0).Seconds(),
+				"stats":   stats,
+			}).Info("disconnect")
 			ws.Close()
-			log.Printf("%v disconnected", ws.Request().RemoteAddr)
 		}),
 	}
 }
 
+func (rtr *router) newReqID() string {
+	rtr.lastReqMtx.Lock()
+	defer rtr.lastReqMtx.Unlock()
+	id := time.Now().UnixNano()
+	if id <= rtr.lastReqID {
+		id = rtr.lastReqID + 1
+	}
+	return strconv.FormatInt(id, 36)
+}
+
+func (rtr *router) DebugStatus() interface{} {
+	s := map[string]interface{}{
+		"HTTP":     rtr.status,
+		"Outgoing": rtr.handler.DebugStatus(),
+	}
+	if es, ok := rtr.eventSource.(debugStatuser); ok {
+		s["EventSource"] = es.DebugStatus()
+	}
+	return s
+}
+
+func (rtr *router) Status() interface{} {
+	return map[string]interface{}{
+		"Clients": atomic.LoadInt64(&rtr.status.ReqsActive),
+	}
+}
+
 func (rtr *router) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 	rtr.setupOnce.Do(rtr.setup)
+	atomic.AddInt64(&rtr.status.ReqsReceived, 1)
+	atomic.AddInt64(&rtr.status.ReqsActive, 1)
+	defer atomic.AddInt64(&rtr.status.ReqsActive, -1)
+
+	logger := logger(req.Context()).
+		WithField("RequestID", rtr.newReqID())
+	ctx := ctxlog.Context(req.Context(), logger)
+	req = req.WithContext(ctx)
+	logger.WithFields(logrus.Fields{
+		"remoteAddr":      req.RemoteAddr,
+		"reqForwardedFor": req.Header.Get("X-Forwarded-For"),
+	}).Info("accept request")
 	rtr.mux.ServeHTTP(resp, req)
-	j, err := json.Marshal(map[string]interface{}{
-		"req": fmt.Sprintf("%+v", req),
-	})
-	if err != nil {
-		log.Fatal(err)
+}
+
+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)
+		err := enc.Encode(fn())
+		if err != nil {
+			msg := "encode failed"
+			logger.WithError(err).Error(msg)
+			http.Error(resp, msg, http.StatusInternalServerError)
+		}
 	}
-	log.Print(string(j))
 }