From 9b6991f130b3121669ae91407e371c2982f34056 Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Wed, 19 Oct 2016 00:38:05 -0300 Subject: [PATCH] Try to encode to UTF-8 or just discard characters Fixes #10 --- handlers/exec.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/handlers/exec.go b/handlers/exec.go index 3265feb..3927ec1 100644 --- a/handlers/exec.go +++ b/handlers/exec.go @@ -5,6 +5,7 @@ import ( "golang.org/x/net/context" "golang.org/x/net/websocket" + "golang.org/x/text/encoding" "github.com/franela/play-with-docker/cookoo" "github.com/franela/play-with-docker/services" @@ -32,13 +33,14 @@ func Exec(ws *websocket.Conn) { return } + encoder := encoding.Replacement.NewEncoder() instance.Conn = conn instance.Stdout = &cookoo.MultiWriter{} instance.Stdout.Init() u1 := uuid.NewV4() instance.Stdout.AddWriter(u1.String(), ws) go func() { - io.Copy(instance.Stdout, instance.Conn.Reader) + io.Copy(encoder.Writer(instance.Stdout), instance.Conn.Reader) instance.Stdout.RemoveWriter(u1.String()) }() go func() {