Skip to content

K
k3s
Commit 8f08cb33 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28910 from rmmh/body-log

Automatic merge from submit-queue Log restclient request/response bodies using %#v. These are now protobufs, so outputting them with %s dumps a large amount of binary garbage into the log. %#v properly escapes exotic characters.
parents 224b0393 f1cd5783
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
pkg/client/restclient/request.go
View file @ 8f08cb33
...@@ -538,10 +538,10 @@ func (r *Request) Body(obj interface{}) *Request { ...@@ -538,10 +538,10 @@ func (r *Request) Body(obj interface{}) *Request {
r.err = err r.err = err
return r return r
} }
glog.V(8).Infof("Request Body: %s", string(data)) glog.V(8).Infof("Request Body: %#v", string(data))
r.body = bytes.NewReader(data) r.body = bytes.NewReader(data)
case []byte: case []byte:
glog.V(8).Infof("Request Body: %s", string(t)) glog.V(8).Infof("Request Body: %#v", string(t))
r.body = bytes.NewReader(t) r.body = bytes.NewReader(t)
case io.Reader: case io.Reader:
r.body = t r.body = t
...@@ -555,7 +555,7 @@ func (r *Request) Body(obj interface{}) *Request { ...@@ -555,7 +555,7 @@ func (r *Request) Body(obj interface{}) *Request {
r.err = err r.err = err
return r return r
} }
glog.V(8).Infof("Request Body: %s", string(data)) glog.V(8).Infof("Request Body: %#v", string(data))
r.body = bytes.NewReader(data) r.body = bytes.NewReader(data)
r.SetHeader("Content-Type", r.content.ContentType) r.SetHeader("Content-Type", r.content.ContentType)
default: default:
...@@ -888,7 +888,7 @@ func (r *Request) transformResponse(resp *http.Response, req *http.Request) Resu ...@@ -888,7 +888,7 @@ func (r *Request) transformResponse(resp *http.Response, req *http.Request) Resu
body = data body = data
} }
} }
glog.V(8).Infof("Response Body: %s", string(body)) glog.V(8).Infof("Response Body: %#v", string(body))
// Did the server give us a status response? // Did the server give us a status response?
isStatusResponse := false isStatusResponse := false
...@@ -970,7 +970,7 @@ func (r *Request) transformUnstructuredResponseError(resp *http.Response, req *h ...@@ -970,7 +970,7 @@ func (r *Request) transformUnstructuredResponseError(resp *http.Response, req *h
body = data body = data
} }
} }
glog.V(8).Infof("Response Body: %s", string(body)) glog.V(8).Infof("Response Body: %#v", string(body))
message := "unknown" message := "unknown"
if isTextResponse(resp) { if isTextResponse(resp) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment