Browse code

Reutrn immediately when inspect connection failed

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Brian Goff authored on 2015/11/05 11:17:05
Showing 1 changed files
... ...
@@ -61,14 +61,19 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
61 61
 	for _, name := range cmd.Args() {
62 62
 		if *inspectType == "" || *inspectType == "container" {
63 63
 			obj, _, err = readBody(cli.call("GET", "/containers/"+name+"/json?"+v.Encode(), nil, nil))
64
-			if err != nil && *inspectType == "container" {
65
-				if strings.Contains(err.Error(), "No such") {
66
-					fmt.Fprintf(cli.err, "Error: No such container: %s\n", name)
67
-				} else {
68
-					fmt.Fprintf(cli.err, "%s", err)
64
+			if err != nil {
65
+				if err == errConnectionFailed {
66
+					return err
67
+				}
68
+				if *inspectType == "container" {
69
+					if strings.Contains(err.Error(), "No such") {
70
+						fmt.Fprintf(cli.err, "Error: No such container: %s\n", name)
71
+					} else {
72
+						fmt.Fprintf(cli.err, "%s", err)
73
+					}
74
+					status = 1
75
+					continue
69 76
 				}
70
-				status = 1
71
-				continue
72 77
 			}
73 78
 		}
74 79
 
... ...
@@ -76,6 +81,9 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
76 76
 			obj, _, err = readBody(cli.call("GET", "/images/"+name+"/json", nil, nil))
77 77
 			isImage = true
78 78
 			if err != nil {
79
+				if err == errConnectionFailed {
80
+					return err
81
+				}
79 82
 				if strings.Contains(err.Error(), "No such") {
80 83
 					if *inspectType == "" {
81 84
 						fmt.Fprintf(cli.err, "Error: No such image or container: %s\n", name)
... ...
@@ -88,7 +96,6 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
88 88
 				status = 1
89 89
 				continue
90 90
 			}
91
-
92 91
 		}
93 92
 
94 93
 		if tmpl == nil {