public_git
/
oauth2-proxy
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixup requests with verbose type

This commit is contained in:
Joel Speed 2021-10-06 17:29:17 +01:00
parent b08e2f1934
commit f6afd93a79
No known key found for this signature in database
GPG Key ID: 6E80578D6751DEFB
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/requests/builder.go
View File

@ -95,16 +95,16 @@ func (r *builder) Do() Result {
func (r *builder) do() Result { func (r *builder) do() Result {
req, err := http.NewRequestWithContext(r.context, r.method, r.endpoint, r.body) req, err := http.NewRequestWithContext(r.context, r.method, r.endpoint, r.body)
if err != nil { if err != nil {
debugLogger().Infof("Error creating request: %v", err) debugLogger.Infof("Error creating request: %v", err)
r.result = &result{err: fmt.Errorf("error creating request: %v", err)} r.result = &result{err: fmt.Errorf("error creating request: %v", err)}
return r.result return r.result
} }
req.Header = r.header req.Header = r.header
traceLogger().Infof("Executing request: Method: %v, Endpoint: %v, Header: %+v", r.method, r.endpoint, r.header) traceLogger.Infof("Executing request: Method: %v, Endpoint: %v, Header: %+v", r.method, r.endpoint, r.header)
resp, err := http.DefaultClient.Do(req) resp, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {
debugLogger().Infof("Error performing request: %v", err) debugLogger.Infof("Error performing request: %v", err)
r.result = &result{err: fmt.Errorf("error performing request: %v", err)} r.result = &result{err: fmt.Errorf("error performing request: %v", err)}
return r.result return r.result
} }
@ -112,12 +112,12 @@ func (r *builder) do() Result {
defer resp.Body.Close() defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body) body, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
debugLogger().Infof("Error reading response body: %v", err) debugLogger.Infof("Error reading response body: %v", err)
r.result = &result{err: fmt.Errorf("error reading response body: %v", err)} r.result = &result{err: fmt.Errorf("error reading response body: %v", err)}
return r.result return r.result
} }
traceLogger().Infof("Request result: Status: %s (%d), Body: %s", resp.Status, resp.StatusCode, string(body)) traceLogger.Infof("Request result: Status: %s (%d), Body: %s", resp.Status, resp.StatusCode, string(body))
r.result = &result{response: resp, body: body} r.result = &result{response: resp, body: body}
return r.result return r.result
} }

5
pkg/requests/logger.go
View File

@ -2,10 +2,9 @@ package requests
import ( import (
"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
"k8s.io/klog/v2"
) )
var ( var (
debugLogger = func() klog.Verbose { return klog.V(logger.RequestDebug) } debugLogger = logger.Verbose(logger.RequestDebug)
traceLogger = func() klog.Verbose { return klog.V(logger.RequestTrace) } traceLogger = logger.Verbose(logger.RequestTrace)
) )