github/docker-labs
1
0
Fork 0
mirror of https://github.com/bingohuang/docker-labs.git synced 2025-07-16 11:57:34 +08:00
Code Issues Releases Wiki Activity

Try to encode to UTF-8 or just discard characters

Browse Source 
Fixes #10
This commit is contained in:
Marcos Lilljedahl 2016-10-19 00:38:05 -03:00
parent 73cdb5a38c
commit 9b6991f130
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
handlers/exec.go
View File

@ -5,6 +5,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"golang.org/x/net/websocket" "golang.org/x/net/websocket"
"golang.org/x/text/encoding"
"github.com/franela/play-with-docker/cookoo" "github.com/franela/play-with-docker/cookoo"
"github.com/franela/play-with-docker/services" "github.com/franela/play-with-docker/services"
@ -32,13 +33,14 @@ func Exec(ws *websocket.Conn) {
return return
} }
encoder := encoding.Replacement.NewEncoder()
instance.Conn = conn instance.Conn = conn
instance.Stdout = &cookoo.MultiWriter{} instance.Stdout = &cookoo.MultiWriter{}
instance.Stdout.Init() instance.Stdout.Init()
u1 := uuid.NewV4() u1 := uuid.NewV4()
instance.Stdout.AddWriter(u1.String(), ws) instance.Stdout.AddWriter(u1.String(), ws)
go func() { go func() {
io.Copy(instance.Stdout, instance.Conn.Reader) io.Copy(encoder.Writer(instance.Stdout), instance.Conn.Reader)
instance.Stdout.RemoveWriter(u1.String()) instance.Stdout.RemoveWriter(u1.String())
}() }()
go func() { go func() {