diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-16 15:09:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-16 15:09:50 +0000 |
commit | b4e854a900ba9bcbfc3476f88317c59ea048daaf (patch) | |
tree | 562b380f7d3587c522d57487465b8df9d0c34746 /workhorse/internal/imageresizer | |
parent | 8215fc964a189ae5c876a10f2e7d61933a725e24 (diff) | |
download | gitlab-ce-b4e854a900ba9bcbfc3476f88317c59ea048daaf.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/imageresizer')
-rw-r--r-- | workhorse/internal/imageresizer/image_resizer.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/workhorse/internal/imageresizer/image_resizer.go b/workhorse/internal/imageresizer/image_resizer.go index 69e9496aec2..7d423b80067 100644 --- a/workhorse/internal/imageresizer/image_resizer.go +++ b/workhorse/internal/imageresizer/image_resizer.go @@ -428,16 +428,18 @@ 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) - log := log.WithRequest(req).WithFields(fields) + logger := log.WithRequest(req).WithFields(fields) switch outcome.status { case statusRequestFailure: if outcome.bytesWritten <= 0 { - helper.Fail500WithFields(w, req, outcome.err, fields) + helper.Fail500(w, req, outcome.err, func(b *log.Builder) *log.Builder { + return b.WithFields(fields) + }) } else { - log.WithError(outcome.err).Error(outcome.status) + logger.WithError(outcome.err).Error(outcome.status) } default: - log.Info(outcome.status) + logger.Info(outcome.status) } } |