16263: Rename no_federation -> bypass_federation

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

diff --git a/services/ws/handler.go b/services/ws/handler.go
index b59e7a7969e4f8faada9306be9305fd53d7d804b..913b1ee8000cbd274039483df70bad7896d52df5 100644 (file)
--- a/services/ws/handler.go
+++ b/services/ws/handler.go
@@ -10,8 +10,8 @@ import (
        "sync"
        "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "git.curoverse.com/arvados.git/sdk/go/stats"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/stats"
 )
 
 type handler struct {
@@ -76,7 +76,7 @@ func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
                                err = errFrameTooBig
                        }
                        if err != nil {
-                               if err != io.EOF {
+                               if err != io.EOF && ctx.Err() == nil {
                                        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 {
-                               log.WithError(err).Error("write failed")
+                               if ctx.Err() == nil {
+                                       log.WithError(err).Error("write failed")
+                               }
                                return
                        }
                        log.Debug("sent")
@@ -177,7 +179,6 @@ func (h *handler) Handle(ws wsConn, eventSource eventSource, newSession func(wsC
                                        default:
                                        }
                                }
-                               continue
                        case e, ok := <-incoming.Channel():
                                if !ok {
                                        return