k-space/dex
Archived
11
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

Merge pull request #629 from ericchiang/dev-storage-kubernetes-dont-print-error

Browse Source 
storage/kubernetes: don't automatically print errors on bad HTTP status codes
This commit is contained in:
Eric Chiang
2016-10-25 14:16:32 -07:00
committed by GitHub
parent 6c4ad8c04d 138ff96c00
commit e0b83af981
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
storage/kubernetes/client.go
View File

@@ -10,7 +10,6 @@ import (
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"log"
"net" "net"
"net/http" "net/http"
"os" "os"
@@ -95,18 +94,17 @@ func checkHTTPErr(r *http.Response, validStatusCodes ...int) error {
return fmt.Errorf("read response body: %v", err) return fmt.Errorf("read response body: %v", err)
} }
// Check this case after we read the body so the connection can be reused.
if r.StatusCode == http.StatusNotFound {
return storage.ErrNotFound
}
var url, method string var url, method string
if r.Request != nil { if r.Request != nil {
method = r.Request.Method method = r.Request.Method
url = r.Request.URL.String() url = r.Request.URL.String()
} }
err = &httpErr{method, url, r.StatusCode, body} return &httpErr{method, url, r.StatusCode, body}
log.Printf("%s", err)
if r.StatusCode == http.StatusNotFound {
return storage.ErrNotFound
}
return err
} }
// Close the response body. The initial request is drained so the connection can // Close the response body. The initial request is drained so the connection can