github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11731 from smarterclayton/better_error

Browse Source 
Update the error message to be idiomatic
This commit is contained in:
Wojciech Tyczynski
2015-07-23 16:09:24 +02:00
parent 361217e0ea f5d040ec31
commit bff2e01994
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/util/httpstream/spdy/roundtripper.go
View File

@@ -135,12 +135,13 @@ func (s *SpdyRoundTripper) NewConnection(resp *http.Response) (httpstream.Connec
responseError := "" responseError := ""
responseErrorBytes, err := ioutil.ReadAll(resp.Body) responseErrorBytes, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
responseError = "Unable to read error from server response" responseError = "unable to read error from server response"
} else { } else {
responseError = string(responseErrorBytes) responseError = string(responseErrorBytes)
responseError = strings.TrimSpace(responseError)
} }
return nil, fmt.Errorf("Unable to upgrade connection: %s", responseError) return nil, fmt.Errorf("unable to upgrade connection: %s", responseError)
} }
return NewClientConnection(s.conn) return NewClientConnection(s.conn)