kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

add [] and move errors to stderr

Browse source
This commit is contained in:
Victor Vieux 2013-06-06 15:45:08 +00:00
parent a799cdad3e
commit 4107701062
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
commands.go
View file

@ -457,7 +457,7 @@ func (cli *DockerCli) CmdStop(args ...string) error {
for _, name := range cmd.Args() { for _, name := range cmd.Args() {
_, _, err := cli.call("POST", "/containers/"+name+"/stop?"+v.Encode(), nil) _, _, err := cli.call("POST", "/containers/"+name+"/stop?"+v.Encode(), nil)
if err != nil { if err != nil {
fmt.Printf("%s", err) fmt.Fprintf(os.Stderr, "%s", err)
} else { } else {
fmt.Println(name) fmt.Println(name)
} }
@ -482,7 +482,7 @@ func (cli *DockerCli) CmdRestart(args ...string) error {
for _, name := range cmd.Args() { for _, name := range cmd.Args() {
_, _, err := cli.call("POST", "/containers/"+name+"/restart?"+v.Encode(), nil) _, _, err := cli.call("POST", "/containers/"+name+"/restart?"+v.Encode(), nil)
if err != nil { if err != nil {
fmt.Printf("%s", err) fmt.Fprintf(os.Stderr, "%s", err)
} else { } else {
fmt.Println(name) fmt.Println(name)
} }
@ -503,7 +503,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {
for _, name := range args { for _, name := range args {
_, _, err := cli.call("POST", "/containers/"+name+"/start", nil) _, _, err := cli.call("POST", "/containers/"+name+"/start", nil)
if err != nil { if err != nil {
fmt.Printf("%s", err) fmt.Fprintf(os.Stderr, "%s", err)
} else { } else {
fmt.Println(name) fmt.Println(name)
} }
@ -520,26 +520,30 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
cmd.Usage() cmd.Usage()
return nil return nil
} }
fmt.Printf("[")
for _, name := range args { for i, name := range args {
if i > 0 {
fmt.Printf(",")
}
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)
if err != nil { if err != nil {
fmt.Printf("%s", err) fmt.Fprintf(os.Stderr, "%s", err)
continue continue
} }
} }
indented := new(bytes.Buffer) indented := new(bytes.Buffer)
if err = json.Indent(indented, obj, "", " "); err != nil { if err = json.Indent(indented, obj, "", " "); err != nil {
fmt.Printf("%s", err) fmt.Fprintf(os.Stderr, "%s", err)
continue continue
} }
if _, err := io.Copy(os.Stdout, indented); err != nil { if _, err := io.Copy(os.Stdout, indented); err != nil {
fmt.Printf("%s", err) fmt.Fprintf(os.Stderr, "%s", err)
} }
} }
fmt.Printf("]")
return nil return nil
} }