Don't print doc url and request id for expected errors
This commit is contained in:
parent
0037e48df5
commit
6cb4e249bd
@ -20,16 +20,6 @@ func IsHTTP(err error) (*http.Response, bool) {
|
||||
return nil, false
|
||||
}
|
||||
|
||||
func ClientErrorMessage(msg, docURL, reqID string) string {
|
||||
if len(docURL) > 0 {
|
||||
msg += "\nDocs: " + docURL
|
||||
}
|
||||
if len(reqID) > 0 {
|
||||
msg += "\nRequest ID: " + reqID
|
||||
}
|
||||
return msg
|
||||
}
|
||||
|
||||
type ClientError struct {
|
||||
Message string `json:"message"`
|
||||
DocumentationUrl string `json:"documentation_url,omitempty"`
|
||||
@ -42,7 +32,7 @@ func (e *ClientError) HTTPResponse() *http.Response {
|
||||
}
|
||||
|
||||
func (e *ClientError) Error() string {
|
||||
return ClientErrorMessage(e.Message, e.DocumentationUrl, e.RequestId)
|
||||
return e.Message
|
||||
}
|
||||
|
||||
func (c *Client) handleResponse(res *http.Response) error {
|
||||
|
@ -95,12 +95,10 @@ func (c *Client) LockFile(path string) (Lock, error) {
|
||||
}
|
||||
|
||||
if len(lockRes.Message) > 0 {
|
||||
return Lock{}, fmt.Errorf("Server unable to create lock: %s",
|
||||
lfsapi.ClientErrorMessage(
|
||||
lockRes.Message,
|
||||
lockRes.DocumentationURL,
|
||||
lockRes.RequestID,
|
||||
))
|
||||
if len(lockRes.RequestID) > 0 {
|
||||
tracerx.Printf("Server Request ID: %s", lockRes.RequestID)
|
||||
}
|
||||
return Lock{}, fmt.Errorf("Server unable to create lock: %s", lockRes.Message)
|
||||
}
|
||||
|
||||
lock := *lockRes.Lock
|
||||
@ -147,12 +145,10 @@ func (c *Client) UnlockFileById(id string, force bool) error {
|
||||
}
|
||||
|
||||
if len(unlockRes.Message) > 0 {
|
||||
return fmt.Errorf("Server unable to unlock: %s",
|
||||
lfsapi.ClientErrorMessage(
|
||||
unlockRes.Message,
|
||||
unlockRes.DocumentationURL,
|
||||
unlockRes.RequestID,
|
||||
))
|
||||
if len(unlockRes.RequestID) > 0 {
|
||||
tracerx.Printf("Server Request ID: %s", unlockRes.RequestID)
|
||||
}
|
||||
return fmt.Errorf("Server unable to unlock: %s", unlockRes.Message)
|
||||
}
|
||||
|
||||
if err := c.cache.RemoveById(id); err != nil {
|
||||
@ -205,12 +201,10 @@ func (c *Client) VerifiableLocks(limit int) (ourLocks, theirLocks []Lock, err er
|
||||
}
|
||||
|
||||
if list.Message != "" {
|
||||
return ourLocks, theirLocks, fmt.Errorf("Server error searching locks: %s",
|
||||
lfsapi.ClientErrorMessage(
|
||||
list.Message,
|
||||
list.DocumentationURL,
|
||||
list.RequestID,
|
||||
))
|
||||
if len(list.RequestID) > 0 {
|
||||
tracerx.Printf("Server Request ID: %s", list.RequestID)
|
||||
}
|
||||
return ourLocks, theirLocks, fmt.Errorf("Server error searching locks: %s", list.Message)
|
||||
}
|
||||
|
||||
for _, l := range list.Ours {
|
||||
@ -273,12 +267,10 @@ func (c *Client) searchRemoteLocks(filter map[string]string, limit int) ([]Lock,
|
||||
}
|
||||
|
||||
if list.Message != "" {
|
||||
return locks, fmt.Errorf("Server error searching for locks: %s",
|
||||
lfsapi.ClientErrorMessage(
|
||||
list.Message,
|
||||
list.DocumentationURL,
|
||||
list.RequestID,
|
||||
))
|
||||
if len(list.RequestID) > 0 {
|
||||
tracerx.Printf("Server Request ID: %s", list.RequestID)
|
||||
}
|
||||
return locks, fmt.Errorf("Server error searching for locks: %s", list.Message)
|
||||
}
|
||||
|
||||
for _, l := range list.Locks {
|
||||
|
Loading…
Reference in New Issue
Block a user