Merge pull request #7 from drand/fix/errormsg

Do not combine nil errors and invalid http status in Get requests
drand · Aug 21, 2024 · bde77ce · bde77ce
2 parents 5c1e30c + ba6d7fe
commit bde77ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/client/http/http.go b/client/http/http.go
@@ -59,7 +59,7 @@ func New(ctx context.Context, l log.Logger, url string, chainHash []byte, transp
 	if err != nil {
 		pn = defaultClientExec
 	}
-	agent := fmt.Sprintf("drand-client-%s/1.0", path.Base(pn))
+	agent := fmt.Sprintf("go-client-%s/2.0", path.Base(pn))
 	c := &httpClient{
 		root:   url,
 		client: createClient(transport),
@@ -320,8 +320,12 @@ func (h *httpClient) Get(ctx context.Context, round uint64) (drand.Result, error
 		req.Header.Set("User-Agent", h.Agent)
 
 		randResponse, err := h.client.Do(req)
-		if err != nil || randResponse.StatusCode != nhttp.StatusOK {
-			resC <- httpGetResponse{nil, fmt.Errorf("doing request %v: %w", req, err)}
+		if err != nil {
+			resC <- httpGetResponse{nil, fmt.Errorf("error doing GET request to %q: %w", url, err)}
+			return
+		}
+		if randResponse.StatusCode != nhttp.StatusOK {
+			resC <- httpGetResponse{nil, fmt.Errorf("got invalid status %d doing GET request to %q", randResponse.StatusCode, url)}
 			return
 		}
 		defer randResponse.Body.Close()

diff --git a/internal/net/client.go b/internal/net/client.go