From 58dc0fcd1e2fae88426c48c440f3ebb23cc87448 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 8 Aug 2023 15:00:20 +0200 Subject: [PATCH] client: Client.Ping: re-use request when falling back to GET Re-use the request, and change the method to GET instead of building a new request "from scratch". Signed-off-by: Sebastiaan van Stijn --- client/ping.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/client/ping.go b/client/ping.go index 347ae71e02..7539e54fef 100644 --- a/client/ping.go +++ b/client/ping.go @@ -37,11 +37,9 @@ func (cli *Client) Ping(ctx context.Context) (types.Ping, error) { return ping, err } - req, err = cli.buildRequest(http.MethodGet, path.Join(cli.basePath, "/_ping"), nil, nil) - if err != nil { - return ping, err - } - serverResp, err = cli.doRequest(ctx, req) + // HEAD failed; fallback to GET. + req.Method = http.MethodGet + serverResp, err = cli.doRequest(req) defer ensureReaderClosed(serverResp) if err != nil { return ping, err