lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't print doc url and request id for expected errors

Browse Source
This commit is contained in:
risk danger olson 2017-02-27 14:16:19 -07:00
parent 0037e48df5
commit 6cb4e249bd
2 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lfsapi/errors.go
View File

@ -20,16 +20,6 @@ func IsHTTP(err error) (*http.Response, bool) {
return nil, false 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 { type ClientError struct {
Message string `json:"message"` Message string `json:"message"`
DocumentationUrl string `json:"documentation_url,omitempty"` DocumentationUrl string `json:"documentation_url,omitempty"`
@ -42,7 +32,7 @@ func (e *ClientError) HTTPResponse() *http.Response {
} }
func (e *ClientError) Error() string { func (e *ClientError) Error() string {
return ClientErrorMessage(e.Message, e.DocumentationUrl, e.RequestId) return e.Message
} }
func (c *Client) handleResponse(res *http.Response) error { func (c *Client) handleResponse(res *http.Response) error {

40
locking/locks.go
View File

@ -95,12 +95,10 @@ func (c *Client) LockFile(path string) (Lock, error) {
} }
if len(lockRes.Message) > 0 { if len(lockRes.Message) > 0 {
return Lock{}, fmt.Errorf("Server unable to create lock: %s", if len(lockRes.RequestID) > 0 {
lfsapi.ClientErrorMessage( tracerx.Printf("Server Request ID: %s", lockRes.RequestID)
lockRes.Message, }
lockRes.DocumentationURL, return Lock{}, fmt.Errorf("Server unable to create lock: %s", lockRes.Message)
lockRes.RequestID,
))
} }
lock := *lockRes.Lock lock := *lockRes.Lock
@ -147,12 +145,10 @@ func (c *Client) UnlockFileById(id string, force bool) error {
} }
if len(unlockRes.Message) > 0 { if len(unlockRes.Message) > 0 {
return fmt.Errorf("Server unable to unlock: %s", if len(unlockRes.RequestID) > 0 {
lfsapi.ClientErrorMessage( tracerx.Printf("Server Request ID: %s", unlockRes.RequestID)
unlockRes.Message, }
unlockRes.DocumentationURL, return fmt.Errorf("Server unable to unlock: %s", unlockRes.Message)
unlockRes.RequestID,
))
} }
if err := c.cache.RemoveById(id); err != nil { 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 != "" { if list.Message != "" {
return ourLocks, theirLocks, fmt.Errorf("Server error searching locks: %s", if len(list.RequestID) > 0 {
lfsapi.ClientErrorMessage( tracerx.Printf("Server Request ID: %s", list.RequestID)
list.Message, }
list.DocumentationURL, return ourLocks, theirLocks, fmt.Errorf("Server error searching locks: %s", list.Message)
list.RequestID,
))
} }
for _, l := range list.Ours { for _, l := range list.Ours {
@ -273,12 +267,10 @@ func (c *Client) searchRemoteLocks(filter map[string]string, limit int) ([]Lock,
} }
if list.Message != "" { if list.Message != "" {
return locks, fmt.Errorf("Server error searching for locks: %s", if len(list.RequestID) > 0 {
lfsapi.ClientErrorMessage( tracerx.Printf("Server Request ID: %s", list.RequestID)
list.Message, }
list.DocumentationURL, return locks, fmt.Errorf("Server error searching for locks: %s", list.Message)
list.RequestID,
))
} }
for _, l := range list.Locks { for _, l := range list.Locks {