From 72aeb63a47bcdffe15380302ff09ab3f0447e476 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Wed, 4 Nov 2015 21:17:05 -0500 Subject: [PATCH] Reutrn immediately when inspect connection failed Signed-off-by: Brian Goff --- api/client/inspect.go | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/api/client/inspect.go b/api/client/inspect.go index 916eec82da..37a3bd4056 100644 --- a/api/client/inspect.go +++ b/api/client/inspect.go @@ -61,14 +61,19 @@ func (cli *DockerCli) CmdInspect(args ...string) error { for _, name := range cmd.Args() { if *inspectType == "" || *inspectType == "container" { obj, _, err = readBody(cli.call("GET", "/containers/"+name+"/json?"+v.Encode(), nil, nil)) - if err != nil && *inspectType == "container" { - if strings.Contains(err.Error(), "No such") { - fmt.Fprintf(cli.err, "Error: No such container: %s\n", name) - } else { - fmt.Fprintf(cli.err, "%s", err) + if err != nil { + if err == errConnectionFailed { + return err + } + if *inspectType == "container" { + if strings.Contains(err.Error(), "No such") { + fmt.Fprintf(cli.err, "Error: No such container: %s\n", name) + } else { + fmt.Fprintf(cli.err, "%s", err) + } + status = 1 + continue } - status = 1 - continue } } @@ -76,6 +81,9 @@ func (cli *DockerCli) CmdInspect(args ...string) error { obj, _, err = readBody(cli.call("GET", "/images/"+name+"/json", nil, nil)) isImage = true if err != nil { + if err == errConnectionFailed { + return err + } if strings.Contains(err.Error(), "No such") { if *inspectType == "" { fmt.Fprintf(cli.err, "Error: No such image or container: %s\n", name) @@ -88,7 +96,6 @@ func (cli *DockerCli) CmdInspect(args ...string) error { status = 1 continue } - } if tmpl == nil {