From 6147c214c3e334d5fe9a378235d94c141bbe5208 Mon Sep 17 00:00:00 2001 From: Michal Horejsek Date: Tue, 12 May 2020 12:01:43 +0200 Subject: [PATCH] Better error message when request is canceled --- Changelog.md | 5 +++++ pkg/pmapi/client.go | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Changelog.md b/Changelog.md index d341f4bd..3b506ad6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/) +## unreleased + +### Changed +* GODT-308 better user error message when request is canceled + ## [v1.2.7] Donghai-hotfix - beta (2020-05-07) ### Added diff --git a/pkg/pmapi/client.go b/pkg/pmapi/client.go index 538cd80c..e68f2992 100644 --- a/pkg/pmapi/client.go +++ b/pkg/pmapi/client.go @@ -56,6 +56,7 @@ var ( ErrInvalidToken = errors.New("refresh token invalid") ErrAPINotReachable = errors.New("cannot reach the server") ErrUpgradeApplication = errors.New("application upgrade required") + ErrConnectionSlow = errors.New("request canceled because connection speed was too slow") ) type ErrUnprocessableEntity struct { @@ -345,6 +346,9 @@ func (c *client) doJSONBuffered(req *http.Request, reqBodyBuffer []byte, data in resBody, err = ioutil.ReadAll(res.Body) } else { resBody, err = c.readAllMinSpeed(res.Body, cancelRequest) + if err == context.Canceled { + err = ErrConnectionSlow + } } // The server response may contain data which we want to have in memory