toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't error out on plugin err with json

Browse Source 
We don't want to error out when there is a json unmarshal error since
the `old way` will cause this to error.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 279dd092b6e9d5f6bb405440fa8d407349f5ad84
Component: engine
This commit is contained in:
Brian Goff
2016-01-06 11:34:14 -05:00
parent 6f7a01ed5b
commit 6262193ba3
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/pkg/plugins/client.go
+4 -5
View File
@@ -134,11 +134,10 @@ func (c *Client) callWithRetry(serviceMethod string, data io.Reader, retry bool)
Err string
}
remoteErr := responseErr{}
if err := json.Unmarshal(b, &remoteErr); err != nil {
return nil, fmt.Errorf("%s: %s", serviceMethod, err)
}
if remoteErr.Err != "" {
return nil, fmt.Errorf("%s: %s", serviceMethod, remoteErr.Err)
if err := json.Unmarshal(b, &remoteErr); err == nil {
if remoteErr.Err != "" {
return nil, fmt.Errorf("%s: %s", serviceMethod, remoteErr.Err)
}
}
// old way...
return nil, fmt.Errorf("%s: %s", serviceMethod, string(b))