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 b59e7a7969e4f8faada9306be9305fd53d7d804b..d527c39ba1c4eeb12c0cbae63526150da27f096d 100644
(file)
--- a/
services/ws/handler.go
+++ b/
services/ws/handler.go
@@
-76,7
+76,7
@@
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")
}
return
log.WithError(err).Info("read error")
}
return
@@
-134,7
+134,9
@@
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")
+ if ctx.Err() == nil {
+ log.WithError(err).Error("write failed")
+ }
return
}
log.Debug("sent")
return
}
log.Debug("sent")
@@
-177,7
+179,6
@@
func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
default:
}
}
default:
}
}
- continue
case e, ok := <-incoming.Channel():
if !ok {
return
case e, ok := <-incoming.Channel():
if !ok {
return