projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show initial fuse mount info when starting tests.
[arvados.git]
/
services
/
ws
/
handler.go
diff --git
a/services/ws/handler.go
b/services/ws/handler.go
index 8d8edcac3417543037bb5397b112d6ca82d51788..d527c39ba1c4eeb12c0cbae63526150da27f096d 100644
(file)
--- a/
services/ws/handler.go
+++ b/
services/ws/handler.go
@@
-1,3
+1,7
@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
package main
import (
package main
import (
@@
-31,6
+35,7
@@
func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
h.setupOnce.Do(h.setup)
ctx, cancel := context.WithCancel(ws.Request().Context())
h.setupOnce.Do(h.setup)
ctx, cancel := context.WithCancel(ws.Request().Context())
+ defer cancel()
log := logger(ctx)
incoming := eventSource.NewSink()
log := logger(ctx)
incoming := eventSource.NewSink()
@@
-52,7
+57,10
@@
func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
return
}
return
}
+ // Receive websocket frames from the client and pass them to
+ // sess.Receive().
go func() {
go func() {
+ defer cancel()
buf := make([]byte, 2<<20)
for {
select {
buf := make([]byte, 2<<20)
for {
select {
@@
-68,22
+76,24
@@
func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
err = errFrameTooBig
}
if err != nil {
err = errFrameTooBig
}
if err != nil {
- if err != io.EOF {
+ if err != io.EOF
&& ctx.Err() == nil
{
log.WithError(err).Info("read error")
}
log.WithError(err).Info("read error")
}
- cancel()
return
}
err = sess.Receive(buf)
if err != nil {
log.WithError(err).Error("sess.Receive() failed")
return
}
err = sess.Receive(buf)
if err != nil {
log.WithError(err).Error("sess.Receive() failed")
- cancel()
return
}
}
}()
return
}
}
}()
+ // Take items from the outgoing queue, serialize them using
+ // sess.EventMessage() as needed, and send them to the client
+ // as websocket frames.
go func() {
go func() {
+ defer cancel()
for {
var ok bool
var data interface{}
for {
var ok bool
var data interface{}
@@
-109,8
+119,7
@@
func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
buf, err = sess.EventMessage(e)
if err != nil {
log.WithError(err).Error("EventMessage failed")
buf, err = sess.EventMessage(e)
if err != nil {
log.WithError(err).Error("EventMessage failed")
- cancel()
- break
+ return
} else if len(buf) == 0 {
log.Debug("skip")
continue
} else if len(buf) == 0 {
log.Debug("skip")
continue
@@
-125,9
+134,10
@@
func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
t0 := time.Now()
_, err = ws.Write(buf)
if err != nil {
t0 := time.Now()
_, err = ws.Write(buf)
if err != nil {
- log.WithError(err).Error("write failed")
- cancel()
- break
+ if ctx.Err() == nil {
+ log.WithError(err).Error("write failed")
+ }
+ return
}
log.Debug("sent")
}
log.Debug("sent")
@@
-149,6
+159,7
@@
func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
// is done/cancelled or the incoming event stream ends. Shut
// down the handler if the outgoing queue fills up.
go func() {
// is done/cancelled or the incoming event stream ends. Shut
// down the handler if the outgoing queue fills up.
go func() {
+ defer cancel()
ticker := time.NewTicker(h.PingTimeout)
defer ticker.Stop()
ticker := time.NewTicker(h.PingTimeout)
defer ticker.Stop()
@@
-168,10
+179,8
@@
func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
default:
}
}
default:
}
}
- continue
case e, ok := <-incoming.Channel():
if !ok {
case e, ok := <-incoming.Channel():
if !ok {
- cancel()
return
}
if !sess.Filter(e) {
return
}
if !sess.Filter(e) {
@@
-181,7
+190,6
@@
func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
case queue <- e:
default:
log.WithError(errQueueFull).Error("terminate")
case queue <- e:
default:
log.WithError(errQueueFull).Error("terminate")
- cancel()
return
}
}
return
}
}
@@
-192,7
+200,7
@@
func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
return
}
return
}
-func (h *handler) Status() interface{} {
+func (h *handler)
Debug
Status() interface{} {
h.mtx.Lock()
defer h.mtx.Unlock()
h.mtx.Lock()
defer h.mtx.Unlock()