Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 6 deletions

diff --git a/workhorse/internal/imageresizer/image_resizer.go b/workhorse/internal/imageresizer/image_resizer.go
index 7d423b80067..69e9496aec2 100644
--- a/workhorse/internal/imageresizer/image_resizer.go
+++ b/workhorse/internal/imageresizer/image_resizer.go
@@ -428,18 +428,16 @@ func logFields(startTime time.Time, params *resizeParams, outcome *resizeOutcome
 
 func handleOutcome(w http.ResponseWriter, req *http.Request, startTime time.Time, params *resizeParams, outcome *resizeOutcome) {
 	fields := logFields(startTime, params, outcome)
-	logger := log.WithRequest(req).WithFields(fields)
+	log := log.WithRequest(req).WithFields(fields)
 
 	switch outcome.status {
 	case statusRequestFailure:
 		if outcome.bytesWritten <= 0 {
-			helper.Fail500(w, req, outcome.err, func(b *log.Builder) *log.Builder {
-				return b.WithFields(fields)
-			})
+			helper.Fail500WithFields(w, req, outcome.err, fields)
 		} else {
-			logger.WithError(outcome.err).Error(outcome.status)
+			log.WithError(outcome.err).Error(outcome.status)
 		}
 	default:
-		logger.Info(outcome.status)
+		log.Info(outcome.status)
 	}
 }