maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

madmin: All APIs return ErrorResponse error type (#3632)

Browse source 
Avoid returning errors.New("Got HTTP Status") in all APIs
This commit is contained in:
Anis Elleuch 2017-01-26 01:01:29 +01:00 committed by Harshavardhana
parent 82373e3d50
commit c753b5dfeb
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/madmin/heal-commands.go
View file

@ -19,7 +19,6 @@ package madmin
import (
"encoding/xml"
"errors"
"fmt"
"net/http"
"net/url"
@ -207,7 +206,8 @@ func (adm *AdminClient) listObjectsHeal(bucket, prefix, marker, delimiter string
}
if resp.StatusCode != http.StatusOK {
return toBeHealedObjects, errors.New("Got HTTP Status: " + resp.Status)
return toBeHealedObjects, httpRespToErrorResponse(resp)
}
err = xml.NewDecoder(resp.Body).Decode(&toBeHealedObjects)
@ -309,7 +309,7 @@ func (adm *AdminClient) ListBucketsHeal() ([]BucketInfo, error) {
}
if resp.StatusCode != http.StatusOK {
return []BucketInfo{}, errors.New("Got HTTP Status: " + resp.Status)
return []BucketInfo{}, httpRespToErrorResponse(resp)
}
var listBucketsHealResult ListBucketsHealResponse
@ -364,7 +364,7 @@ func (adm *AdminClient) HealBucket(bucket string, dryrun bool) error {
}
if resp.StatusCode != http.StatusOK {
return errors.New("Got HTTP Status: " + resp.Status)
return httpRespToErrorResponse(resp)
}
return nil
@ -398,7 +398,7 @@ func (adm *AdminClient) HealObject(bucket, object string, dryrun bool) error {
}
if resp.StatusCode != http.StatusOK {
return errors.New("Got HTTP Status: " + resp.Status)
return httpRespToErrorResponse(resp)
}
return nil
@ -430,7 +430,7 @@ func (adm *AdminClient) HealFormat(dryrun bool) error {
}
if resp.StatusCode != http.StatusOK {
return errors.New("Got HTTP Status: " + resp.Status)
return httpRespToErrorResponse(resp)
}
return nil

5
pkg/madmin/lock-commands.go
View file

@ -19,7 +19,6 @@ package madmin
import (
"encoding/json"
"errors"
"io"
"io/ioutil"
"net/http"
@ -118,7 +117,7 @@ func (adm *AdminClient) ListLocks(bucket, prefix string, olderThan time.Duration
}
if resp.StatusCode != http.StatusOK {
return nil, errors.New("Got HTTP Status: " + resp.Status)
return nil, httpRespToErrorResponse(resp)
}
return getLockInfos(resp.Body)
@ -150,7 +149,7 @@ func (adm *AdminClient) ClearLocks(bucket, prefix string, olderThan time.Duratio
}
if resp.StatusCode != http.StatusOK {
return nil, errors.New("Got HTTP Status: " + resp.Status)
return nil, httpRespToErrorResponse(resp)
}
return getLockInfos(resp.Body)

4
pkg/madmin/service.go → pkg/madmin/service-commands.go
View file

@ -92,7 +92,7 @@ func (adm *AdminClient) ServiceStatus() (ServiceStatusMetadata, error) {
// Check response http status code
if resp.StatusCode != http.StatusOK {
return ServiceStatusMetadata{}, errors.New("Got HTTP Status: " + resp.Status)
return ServiceStatusMetadata{}, httpRespToErrorResponse(resp)
}
// Unmarshal the server's json response
@ -129,7 +129,7 @@ func (adm *AdminClient) ServiceRestart() error {
}
if resp.StatusCode != http.StatusOK {
return errors.New("Got HTTP Status: " + resp.Status)
return httpRespToErrorResponse(resp)
}
return nil
}