diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-17 06:11:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-17 06:11:13 +0300 |
commit | 4f45a841a19e1d2ec32d3c0dd256978251c11061 (patch) | |
tree | 22436975aae4278c3a2f43618924b58997713d8e /workhorse/internal/imageresizer | |
parent | 86eb30c847058217f94dd71918d8c3ea647cb61d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/imageresizer')
-rw-r--r-- | workhorse/internal/imageresizer/image_resizer.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/workhorse/internal/imageresizer/image_resizer.go b/workhorse/internal/imageresizer/image_resizer.go index a21d2838acb..cd0fa946530 100644 --- a/workhorse/internal/imageresizer/image_resizer.go +++ b/workhorse/internal/imageresizer/image_resizer.go @@ -186,12 +186,15 @@ func (r *Resizer) Inject(w http.ResponseWriter, req *http.Request, paramsData st } defer imageFile.reader.Close() + widthLabelVal := strconv.Itoa(int(params.Width)) + outcome.originalFileSize = imageFile.contentLength setLastModified(w, imageFile.lastModified) // If the original file has not changed, then any cached resized versions have not changed either. if checkNotModified(req, imageFile.lastModified) { writeNotModified(w) + imageResizeDurations.WithLabelValues(params.ContentType, widthLabelVal).Observe(time.Since(start).Seconds()) outcome.ok(statusClientCache) return } @@ -221,7 +224,6 @@ func (r *Resizer) Inject(w http.ResponseWriter, req *http.Request, paramsData st return } - widthLabelVal := strconv.Itoa(int(params.Width)) imageResizeDurations.WithLabelValues(params.ContentType, widthLabelVal).Observe(time.Since(start).Seconds()) outcome.ok(statusSuccess) |