Add configuratuion option to allow to change caching time or disable it

Author: lafriks

conf/app.ini

@@ -337,6 +337,9 @@ INTERVAL = 60
 ; redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
 ; memcache: `127.0.0.1:11211`
 HOST =
+; Time to keep items in cache if not used, default is 16 hours.
+; Setting it to 0 disables caching
+ITEM_TTL = 16h
 
 [session]
 ; Either "memory", "file", or "redis", default is "memory"

modules/cache/cache.go

@@ -5,8 +5,6 @@
 package cache
 
 import (
-	"time"
-
 	"code.gitea.io/gitea/modules/setting"
 
 	mc "github.com/go-macaron/cache"
@@ -31,7 +29,7 @@ func NewContext() error {
 
 // GetInt returns key value from cache with callback when no key exists in cache
 func GetInt(key string, getFunc func() (int, error)) (int, error) {
-	if conn == nil {
+	if conn == nil || setting.CacheService.TTL == 0 {
 		return getFunc()
 	}
 	if !conn.IsExist(key) {
@@ -42,14 +40,14 @@ func GetInt(key string, getFunc func() (int, error)) (int, error) {
 		if value, err = getFunc(); err != nil {
 			return value, err
 		}
-		conn.Put(key, value, int64(time.Hour.Seconds()))
+		conn.Put(key, value, int64(setting.CacheService.TTL.Seconds()))
 	}
 	return conn.Get(key).(int), nil
 }
 
 // GetInt64 returns key value from cache with callback when no key exists in cache
 func GetInt64(key string, getFunc func() (int64, error)) (int64, error) {
-	if conn == nil {
+	if conn == nil || setting.CacheService.TTL == 0 {
 		return getFunc()
 	}
 	if !conn.IsExist(key) {
@@ -60,7 +58,7 @@ func GetInt64(key string, getFunc func() (int64, error)) (int64, error) {
 		if value, err = getFunc(); err != nil {
 			return value, err
 		}
-		conn.Put(key, value, int64(time.Hour.Seconds()))
+		conn.Put(key, value, int64(setting.CacheService.TTL.Seconds()))
 	}
 	return conn.Get(key).(int64), nil
 }

modules/setting/setting.go

@@ -1277,6 +1277,7 @@ type Cache struct {
 	Adapter  string
 	Interval int
 	Conn     string
+	TTL      time.Duration
 }
 
 var (
@@ -1285,7 +1286,7 @@ var (
 )
 
 func newCacheService() {
-	sec := Cfg.Section("mailer")
+	sec := Cfg.Section("cache")
 	CacheService = &Cache{
 		Adapter: sec.Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"}),
 	}
@@ -1297,6 +1298,7 @@ func newCacheService() {
 	default:
 		log.Fatal(4, "Unknown cache adapter: %s", CacheService.Adapter)
 	}
+	CacheService.TTL = sec.Key("ITEM_TTL").MustDuration(16 * time.Hour)
 
 	log.Info("Cache Service Enabled")
 }