From 486bca6d94dcfeb34c5af4182d1437f4c2a5273e Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Wed, 6 Jan 2016 11:29:40 -0500 Subject: [PATCH] Don't error out on plugin err with json 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 --- plugins/client.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/client.go b/plugins/client.go index d871012..934a829 100644 --- a/plugins/client.go +++ b/plugins/client.go @@ -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))