Browse Source

Merge pull request #33358 from vdemeester/fix-integration-request-package

Fix `request.SockRequestRaw` error check
Tõnis Tiigi 8 years ago
parent
commit
ffd3d6ccd9
1 changed files with 4 additions and 3 deletions
  1. 4 3
      integration-cli/request/request.go

+ 4 - 3
integration-cli/request/request.go

@@ -217,13 +217,14 @@ func SockRequestRaw(method, endpoint string, data io.Reader, ct, daemon string,
 	}
 	}
 
 
 	resp, err := client.Do(req)
 	resp, err := client.Do(req)
+	if err != nil {
+		client.Close()
+		return resp, nil, err
+	}
 	body := ioutils.NewReadCloserWrapper(resp.Body, func() error {
 	body := ioutils.NewReadCloserWrapper(resp.Body, func() error {
 		defer resp.Body.Close()
 		defer resp.Body.Close()
 		return client.Close()
 		return client.Close()
 	})
 	})
-	if err != nil {
-		client.Close()
-	}
 
 
 	return resp, body, err
 	return resp, body, err
 }
 }