docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean split between errors and output. JSON output always valid

This commit is contained in:
Victor Vieux 2013-10-17 23:40:43 +00:00
parent 414795856a
commit 8bce284496
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
commands.go
View File

@ -577,11 +577,10 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
cmd.Usage() cmd.Usage()
return nil return nil
} }
fmt.Fprintf(cli.out, "[")
for i, name := range args { indented := new(bytes.Buffer)
if i > 0 {
fmt.Fprintf(cli.out, ",") for _, name := range args {
}
obj, _, err := cli.call("GET", "/containers/"+name+"/json", nil) obj, _, err := cli.call("GET", "/containers/"+name+"/json", nil)
if err != nil { if err != nil {
obj, _, err = cli.call("GET", "/images/"+name+"/json", nil) obj, _, err = cli.call("GET", "/images/"+name+"/json", nil)
@ -591,14 +590,18 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
} }
} }
indented := new(bytes.Buffer)
if err = json.Indent(indented, obj, "", " "); err != nil { if err = json.Indent(indented, obj, "", " "); err != nil {
fmt.Fprintf(cli.err, "%s\n", err) fmt.Fprintf(cli.err, "%s\n", err)
continue continue
} }
if _, err := io.Copy(cli.out, indented); err != nil { indented.WriteString(",")
fmt.Fprintf(cli.err, "%s\n", err) }
} // Remove trailling ','
indented.Truncate(indented.Len() - 1)
fmt.Fprintf(cli.out, "[")
if _, err := io.Copy(cli.out, indented); err != nil {
fmt.Fprintf(cli.err, "%s\n", err)
} }
fmt.Fprintf(cli.out, "]") fmt.Fprintf(cli.out, "]")
return nil return nil