From 6d9cdbf24f1f99dd42788afcadc300128175f42f Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Thu, 27 Mar 2014 18:27:58 -0700 Subject: [PATCH] beam/examples/beamsh: 'emit' supports key=value syntax to compose arbitrary objects Docker-DCO-1.1-Signed-off-by: Solomon Hykes (github: shykes) --- pkg/beam/examples/beamsh/beamsh.go | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/pkg/beam/examples/beamsh/beamsh.go b/pkg/beam/examples/beamsh/beamsh.go index 4234e9d988..a712ca53f6 100644 --- a/pkg/beam/examples/beamsh/beamsh.go +++ b/pkg/beam/examples/beamsh/beamsh.go @@ -452,7 +452,7 @@ func GetHandler(name string) Handler { } } else if name == "emit" { return func(args []string, in *net.UnixConn, out *net.UnixConn) { - beam.Send(out, data.Empty().Set("foo", args[1:]...).Bytes(), nil) + beam.Send(out, data.Parse(args[1:]).Bytes(), nil) } } else if name == "print" { return func(args []string, in *net.UnixConn, out *net.UnixConn) { @@ -631,27 +631,6 @@ func connToFile(conn net.Conn) (f *os.File, err error) { return f, err } -// 'status' is a notification of a job's status. -// -func parseEnv(args []string) ([]string, map[string]string) { - var argsOut []string - env := make(map[string]string) - for _, word := range args[1:] { - if strings.Contains(word, "=") { - kv := strings.SplitN(word, "=", 2) - key := kv[0] - var val string - if len(kv) == 2 { - val = kv[1] - } - env[key] = val - } else { - argsOut = append(argsOut, word) - } - } - return argsOut, env -} - type Msg struct { payload []byte attachment *os.File