Merge pull request #364 from aerokube/demux_logs

right demultiplex for docker logs
aerokube · Mar 4, 2018 · f68af81 · f68af81
2 parents 3a0a9ce + eb0ed77
commit f68af81
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/selenoid.go b/selenoid.go
@@ -27,6 +27,7 @@ import (
 	"github.com/aerokube/selenoid/util"
 	"github.com/docker/docker/api/types"
 	"golang.org/x/net/websocket"
+	"github.com/docker/docker/pkg/stdcopy"
 )
 
 var (
@@ -490,7 +491,7 @@ func logs(wsconn *websocket.Conn) {
 		}
 		defer r.Close()
 		wsconn.PayloadType = websocket.BinaryFrame
-		io.Copy(wsconn, r)
+		stdcopy.StdCopy(wsconn, wsconn, r)
 		log.Printf("[%d] [CONTAINER_LOGS_DISCONNECTED] [%s]", requestId, sid)
 	} else {
 		log.Printf("[%d] [SESSION_NOT_FOUND] [%s]", requestId, sid)