Revise the use of htime.Since/htime.Now

We cannot (also, it doesn't add any value)  use that when the `clock` is set,

* To measure time (before that global is set)
* To compare file timestamps re cache eviction

Fixes #9868
This commit is contained in:
Bjørn Erik Pedersen
2022-05-09 10:05:19 +02:00
parent 860c51c314
commit 51f08b0b6a
9 changed files with 22 additions and 20 deletions

View File

@@ -27,10 +27,10 @@ import (
"sort"
"strings"
"sync"
"time"
"unicode"
"unicode/utf8"
"github.com/gohugoio/hugo/common/htime"
"github.com/gohugoio/hugo/common/types"
"github.com/gohugoio/hugo/helpers"
@@ -235,7 +235,7 @@ func (t *templateExec) ExecuteWithContext(ctx context.Context, templ tpl.Templat
defer rlocker.RUnlock()
}
if t.Metrics != nil {
defer t.Metrics.MeasureSince(templ.Name(), htime.Now())
defer t.Metrics.MeasureSince(templ.Name(), time.Now())
}
if t.templateUsageTracker != nil {