vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

beam/examples/beamsh: more useful debugging

Browse source 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
This commit is contained in:
Solomon Hykes 2014-03-26 15:46:02 -07:00
parent ca0aacdb6b
commit 0f36b222f3
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
beam/examples/beamsh/beamsh.go
View file

@ -56,23 +56,25 @@ func main() {
} }
} }
func beamCopy(dst *net.UnixConn, src *net.UnixConn) error { func beamCopy(dst *net.UnixConn, src *net.UnixConn) (int, error) {
var n int
for { for {
payload, attachment, err := beam.Receive(src) payload, attachment, err := beam.Receive(src)
if err == io.EOF { if err == io.EOF {
return nil return n, nil
} else if err != nil { } else if err != nil {
return err return n, err
} }
if err := beam.Send(dst, payload, attachment); err != nil { if err := beam.Send(dst, payload, attachment); err != nil {
if attachment != nil { if attachment != nil {
attachment.Close() attachment.Close()
} }
return err return n, err
} }
n++
} }
panic("impossibru!") panic("impossibru!")
return nil return n, nil
} }
type Handler func([]string, *net.UnixConn, *net.UnixConn) type Handler func([]string, *net.UnixConn, *net.UnixConn)
@ -165,7 +167,11 @@ func executeCommand(client *net.UnixConn, cmd *dockerscript.Command) error {
}() }()
go func() { go func() {
Debugf("[%s] copy start...\n", strings.Join(cmd.Args, " ")) Debugf("[%s] copy start...\n", strings.Join(cmd.Args, " "))
beamCopy(client, outPub) n, err := beamCopy(client, outPub)
if err != nil {
Fatal(err)
}
Debugf("[%s] copied %d messages\n", strings.Join(cmd.Args, " "), n)
Debugf("[%s] copy done\n", strings.Join(cmd.Args, " ")) Debugf("[%s] copy done\n", strings.Join(cmd.Args, " "))
tasks.Done() tasks.Done()
}() }()