validation message in backend log's message field (#21)

coupergateway · Dec 9, 2020 · f46c641 · f46c641
1 parent 8622993
commit f46c641
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/handler/proxy.go b/handler/proxy.go
@@ -280,18 +280,20 @@ func (p *Proxy) roundtrip(rw http.ResponseWriter, req *http.Request) {
 		outreq.Header.Set("X-Forwarded-For", clientIP)
 	}
 
+	roundtripInfo := req.Context().Value(request.RoundtripInfo).(*logging.RoundtripInfo)
+
 	validationCtx, route, requestValidationInput, err := p.prepareRequestValidation(outreq)
 	if err != nil {
 		// this only happens if os.Getwd() fails
 		// TODO: use error template from parent endpoint>api>server
-		p.log.WithField("upstream request validation", err).Error()
+		roundtripInfo.Err = err
 		couperErr.DefaultJSON.ServeError(couperErr.UpstreamRequestValidationFailed).ServeHTTP(rw, req)
 		return
 	}
 	if requestValidationInput != nil {
 		if err := openapi3filter.ValidateRequest(validationCtx, requestValidationInput); err != nil {
 			// TODO: use error template from parent endpoint>api>server
-			p.log.WithField("upstream request validation", err).Error()
+			roundtripInfo.Err = err
 			if !p.options.OpenAPI.IgnoreRequestViolations {
 				couperErr.DefaultJSON.ServeError(couperErr.UpstreamRequestValidationFailed).ServeHTTP(rw, req)
 				return
@@ -300,8 +302,10 @@ func (p *Proxy) roundtrip(rw http.ResponseWriter, req *http.Request) {
 	}
 
 	res, err := p.getTransport(outreq.URL.Scheme, outreq.URL.Host, outreq.Host).RoundTrip(outreq)
-	roundtripInfo := req.Context().Value(request.RoundtripInfo).(*logging.RoundtripInfo)
-	roundtripInfo.BeReq, roundtripInfo.BeResp, roundtripInfo.Err = outreq, res, err
+	roundtripInfo.BeReq, roundtripInfo.BeResp = outreq, res
+	if err != nil {
+		roundtripInfo.Err = err
+	}
 	if err != nil {
 		p.srvOptions.APIErrTpl.ServeError(couperErr.APIConnect).ServeHTTP(rw, req)
 		return
@@ -332,14 +336,14 @@ func (p *Proxy) roundtrip(rw http.ResponseWriter, req *http.Request) {
 	if err != nil {
 		// this only happens if response body buffering fails
 		// TODO: use error template from parent endpoint>api>server
-		p.log.WithField("upstream response validation", err).Error()
+		roundtripInfo.Err = err
 		couperErr.DefaultJSON.ServeError(couperErr.UpstreamResponseBufferingFailed).ServeHTTP(rw, req)
 		return
 	}
 	if responseValidationInput != nil && route != nil {
 		if err := openapi3filter.ValidateResponse(validationCtx, responseValidationInput); err != nil {
 			// TODO: use error template from parent endpoint>api>server
-			p.log.WithField("upstream response validation", err).Error()
+			roundtripInfo.Err = err
 			if !p.options.OpenAPI.IgnoreResponseViolations {
 				couperErr.DefaultJSON.ServeError(couperErr.UpstreamResponseValidationFailed).ServeHTTP(rw, req)
 				return