From 30f7ddb833adfe276a93c1a79e243b8d33bdd41e Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 9 Feb 2021 22:29:03 +0000 Subject: Ensure memcache TTL cannot be over 30 days (#14592) Memcached TTL cannot be > 30 days and if it is attempted the TTL is interpreted as a unix timestamp. This PR ensures that the TTL is switched to a unix timestamp in those cases. Fix #14571 Signed-off-by: Andrew Thornton --- modules/cache/cache.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/cache') diff --git a/modules/cache/cache.go b/modules/cache/cache.go index 609f5a242b..3a2732c343 100644 --- a/modules/cache/cache.go +++ b/modules/cache/cache.go @@ -58,7 +58,7 @@ func GetString(key string, getFunc func() (string, error)) (string, error) { if value, err = getFunc(); err != nil { return value, err } - err = conn.Put(key, value, int64(setting.CacheService.TTL.Seconds())) + err = conn.Put(key, value, setting.CacheService.TTLSeconds()) if err != nil { return "", err } @@ -86,7 +86,7 @@ func GetInt(key string, getFunc func() (int, error)) (int, error) { if value, err = getFunc(); err != nil { return value, err } - err = conn.Put(key, value, int64(setting.CacheService.TTL.Seconds())) + err = conn.Put(key, value, setting.CacheService.TTLSeconds()) if err != nil { return 0, err } @@ -118,7 +118,7 @@ func GetInt64(key string, getFunc func() (int64, error)) (int64, error) { if value, err = getFunc(); err != nil { return value, err } - err = conn.Put(key, value, int64(setting.CacheService.TTL.Seconds())) + err = conn.Put(key, value, setting.CacheService.TTLSeconds()) if err != nil { return 0, err } -- cgit v1.2.3