瀏覽代碼

Merge pull request #8345 from duglin/Issue5184

Add a better error message when we get an unknown http issue
Tibor Vass 10 年之前
父節點
當前提交
b79211f4ae
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      api/client/utils.go

+ 6 - 1
api/client/utils.go

@@ -96,7 +96,12 @@ func (cli *DockerCli) call(method, path string, data interface{}, passAuthInfo b
 		if strings.Contains(err.Error(), "connection refused") {
 		if strings.Contains(err.Error(), "connection refused") {
 			return nil, -1, ErrConnectionRefused
 			return nil, -1, ErrConnectionRefused
 		}
 		}
-		return nil, -1, err
+
+		if cli.tlsConfig == nil {
+			return nil, -1, fmt.Errorf("%v. Are you trying to connect to a TLS-enabled daemon without TLS?", err)
+		}
+		return nil, -1, fmt.Errorf("An error occurred trying to connect: %v", err)
+
 	}
 	}
 
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 400 {
 	if resp.StatusCode < 200 || resp.StatusCode >= 400 {