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

beam/examples/beamsh: use beam/data

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-24 17:32:26 -07:00
parent dd23e21313
commit b78465fc2a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,11 +6,11 @@ import (
"os" "os"
"github.com/dotcloud/docker/pkg/dockerscript" "github.com/dotcloud/docker/pkg/dockerscript"
"github.com/dotcloud/docker/pkg/beam" "github.com/dotcloud/docker/pkg/beam"
"github.com/dotcloud/docker/pkg/beam/data"
"github.com/dotcloud/docker/pkg/term" "github.com/dotcloud/docker/pkg/term"
"strings" "strings"
"sync" "sync"
"net" "net"
"bytes"
"path" "path"
"bufio" "bufio"
"strconv" "strconv"
@ -62,7 +62,7 @@ func main() {
func executeScript(client *net.UnixConn, script []*dockerscript.Command) { func executeScript(client *net.UnixConn, script []*dockerscript.Command) {
Debugf("%d commands:\n", len(script)) Debugf("%d commands:\n", len(script))
for _, cmd := range script { for _, cmd := range script {
job, err := beam.SendPipe(client, []byte(strings.Join(cmd.Args, " "))) job, err := beam.SendPipe(client, data.Empty().Set("cmd", cmd.Args...).Bytes())
if err != nil { if err != nil {
Fatal(err) Fatal(err)
} }
@ -75,16 +75,18 @@ func executeScript(client *net.UnixConn, script []*dockerscript.Command) {
} }
func parseMsgPayload(payload []byte) ([]string, error) { func parseMsgPayload(payload []byte) ([]string, error) {
// FIXME: send structured message instead of a text script msg, err := data.Decode(string(payload))
cmds, err := dockerscript.Parse(bytes.NewReader(payload))
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(cmds) == 0 { var cmd []string
if c, exists := msg["cmd"]; exists {
cmd = c
}
if len(cmd) == 0 {
return nil, fmt.Errorf("empty command") return nil, fmt.Errorf("empty command")
} }
// We don't care about multiple commands or children return cmd, nil
return cmds[0].Args, nil
} }
func CmdCat(args []string, f *os.File) { func CmdCat(args []string, f *os.File) {
@ -110,7 +112,7 @@ func CmdEcho(args []string, f *os.File) {
return return
} }
Debugf("[CmdEcho] stdout pipe() r=%d w=%d\n", r.Fd(), w.Fd()) Debugf("[CmdEcho] stdout pipe() r=%d w=%d\n", r.Fd(), w.Fd())
if err := beam.Send(resp, []byte("log stdout"), r); err != nil { if err := beam.Send(resp, data.Empty().Set("cmd", "log", "stdout").Bytes(), r); err != nil {
return return
} }
fmt.Fprintln(w, strings.Join(args[1:], " ")) fmt.Fprintln(w, strings.Join(args[1:], " "))