Skip to content

feature(client.go): define error message #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feature(client.go): define error message #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@ var (
schemeErrorRe = regexp.MustCompile(`unsupported protocol scheme`)
)

const (
// A request failed error message.
RequestFailedMsg = "request failed"

// A reading response body error message.
ReadBodyErrorMsg = "error reading response body"
)

// ReaderFunc is the type of function that can be given natively to NewRequest
type ReaderFunc func() (io.Reader, error)

Expand Down Expand Up @@ -599,9 +607,9 @@ func (c *Client) Do(req *Request) (*http.Response, error) {
if doErr != nil {
switch v := logger.(type) {
case LeveledLogger:
v.Error("request failed", "error", doErr, "method", req.Method, "url", req.URL)
v.Error(RequestFailedMsg, "error", doErr, "method", req.Method, "url", req.URL)
case Logger:
v.Printf("[ERR] %s %s request failed: %v", req.Method, req.URL, doErr)
v.Printf("[ERR] %s %s %s: %v", req.Method, req.URL, RequestFailedMsg, doErr)
}
} else {
// Call this here to maintain the behavior of logging all requests,
Expand Down Expand Up @@ -702,9 +710,9 @@ func (c *Client) drainBody(body io.ReadCloser) {
if c.logger() != nil {
switch v := c.logger().(type) {
case LeveledLogger:
v.Error("error reading response body", "error", err)
v.Error(ReadBodyErrorMsg, "error", err)
case Logger:
v.Printf("[ERR] error reading response body: %v", err)
v.Printf("[ERR] %s: %v", ReadBodyErrorMsg, err)
}
}
}
Expand Down