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

@ -24,7 +24,6 @@ import (
"sync"
"time"
"github.com/gohugoio/hugo/common/htime"
"github.com/gohugoio/hugo/common/hugio"
"github.com/gohugoio/hugo/helpers"
@ -296,7 +295,10 @@ func (c *Cache) isExpired(modTime time.Time) bool {
if c.maxAge < 0 {
return false
}
return c.maxAge == 0 || htime.Since(modTime) > c.maxAge
// Note the use of time.Since here.
// We cannot use Hugo's global Clock for this.
return c.maxAge == 0 || time.Since(modTime) > c.maxAge
}
// For testing