Skip to content

Ensure memcache TTL cannot be over 30 days #14592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 9, 2021
Merged

Ensure memcache TTL cannot be over 30 days #14592

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b4a8310
Ensure memcache TTL cannot be over 30 days
zeripath Feb 7, 2021
34e2f78
Merge branch 'master' into fix-14571-set-maximum-TTL-for-memcached
zeripath Feb 7, 2021
3970b1c
Merge branch 'master' into fix-14571-set-maximum-TTL-for-memcached
lunny Feb 8, 2021
48fd098
as per @cirnoT
zeripath Feb 7, 2021
cb33ee3
Merge remote-tracking branch 'origin/master' into fix-14571-set-maxim…
zeripath Feb 9, 2021
4d621ce
simplify
zeripath Feb 9, 2021
763ac92
missed go-git variant
zeripath Feb 9, 2021
1176d43
missed go-git variant
zeripath Feb 9, 2021
c05f9d1
Merge branch 'master' into fix-14571-set-maximum-TTL-for-memcached
zeripath Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion modules/setting/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ var (
}
)

const memcachemax = 30 * 24 * time.Hour

func newCacheService() {
sec := Cfg.Section("cache")
if err := sec.MapTo(&CacheService); err != nil {
Expand All @@ -58,8 +60,19 @@ func newCacheService() {
CacheService.Adapter = sec.Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"})
switch CacheService.Adapter {
case "memory":
case "redis", "memcache":
case "redis":
CacheService.Conn = strings.Trim(sec.Key("HOST").String(), "\" ")
case "memcache":
CacheService.Conn = strings.Trim(sec.Key("HOST").String(), "\" ")
if CacheService.TTL > memcachemax {
log.Warn("Cache service: provided TTL %v is too long for memcache, defaulting to maximum of 30 days", CacheService.TTL)
CacheService.TTL = memcachemax
}
if CacheService.LastCommit.TTL > memcachemax {
log.Warn("Cache service: provided LastCommit cache TTL %v is too long for memcache, defaulting to maximum of 30 days", CacheService.LastCommit.TTL)

CacheService.LastCommit.TTL = memcachemax
}
case "": // disable cache
CacheService.Enabled = false
default:
Expand Down