7491: Fix response body close, error logging.

[arvados.git] / sdk / go / keepclient / keepclient.go

diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index eb011f070a33334a0f2d673a10ce091aed4f0368..2f9ea44ab8e55ce7cae1849713651f5141424da1 100644 (file)
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -167,11 +167,9 @@ func (kc *KeepClient) getOrHead(method string, locator string) (io.ReadCloser, i
                                retryList = append(retryList, host)
                        } else if resp.StatusCode != http.StatusOK {
                                var respbody []byte
-                               if resp.Body != nil {
-                                       respbody, _ = ioutil.ReadAll(&io.LimitedReader{resp.Body, 4096})
-                                       resp.Body.Close()
-                               }
-                               errs = append(errs, fmt.Sprintf("%s: %d %s",
+                               respbody, _ = ioutil.ReadAll(&io.LimitedReader{resp.Body, 4096})
+                               resp.Body.Close()
+                               errs = append(errs, fmt.Sprintf("%s: HTTP %d %q",
                                        url, resp.StatusCode, bytes.TrimSpace(respbody)))
 
                                if resp.StatusCode == 408 ||
@@ -191,6 +189,7 @@ func (kc *KeepClient) getOrHead(method string, locator string) (io.ReadCloser, i
                                                Check:  locator[0:32],
                                        }, resp.ContentLength, url, nil
                                } else {
+                                       resp.Body.Close()
                                        return nil, resp.ContentLength, url, nil
                                }
                        }
@@ -198,7 +197,7 @@ func (kc *KeepClient) getOrHead(method string, locator string) (io.ReadCloser, i
                }
                serversToTry = retryList
        }
-       log.Printf("DEBUG: GET %s failed: %v", locator, errs)
+       log.Printf("DEBUG: %s %s failed: %v", method, locator, errs)
 
        return nil, 0, "", BlockNotFound
 }