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

Merge pull request #19131 from cpuguy83/fix_plugin_error_handling

Browse Source 
Don't error out on plugin err with json
Upstream-commit: f4f848b7a55f142befd13b76803d7d884f815419
Component: engine
This commit is contained in:
Antonio Murdaca
2016-01-08 12:22:45 +01:00
parent 2f9e2cb95f 6262193ba3
commit 04c25bef6f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/engine/pkg/plugins/client.go
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))