Merge pull request #11731 from smarterclayton/better_error

Update the error message to be idiomatic

Merge pull request #11731 from smarterclayton/better_error
bff2e019 · Wojciech Tyczynski · 361217e0 · f5d040ec · bff2e019
Commit bff2e019 authored Jul 23, 2015 by Wojciech Tyczynski
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

roundtripper.go pkg/util/httpstream/spdy/roundtripper.go +3 -2

No files found.
--- a/pkg/util/httpstream/spdy/roundtripper.go
+++ b/pkg/util/httpstream/spdy/roundtripper.go
@@ -135,12 +135,13 @@ func (s *SpdyRoundTripper) NewConnection(resp *http.Response) (httpstream.Connec
 		responseError := ""
 		responseErrorBytes, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
-			responseError = "Unable to read error from server response"
+			responseError = "unable to read error from server response"
 		} else {
 			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)