Revert Enabled back

Author: lafriks

custom/conf/app.ini.sample

@@ -632,6 +632,8 @@ SENDMAIL_PATH = sendmail
 SENDMAIL_ARGS =
 
 [cache]
+; if the cache enabled
+ENABLED = true
 ; Either "memory", "redis", or "memcache", default is "memory"
 ADAPTER = memory
 ; For "memory" only, GC interval in seconds, default is 60
@@ -646,6 +648,8 @@ ITEM_TTL = 16h
 
 ; Last commit cache
 [cache.last_commit]
+; if the cache enabled
+ENABLED = true
 ; Time to keep items in cache if not used, default is 16 hours.
 ; Setting it to 0 disables caching
 ITEM_TTL = 16h

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -383,6 +383,7 @@ relation to port exhaustion.
 
 ## Cache (`cache`)
 
+- `ENABLED`: **true**: Enable the cache.
 - `ADAPTER`: **memory**: Cache engine adapter, either `memory`, `redis`, or `memcache`.
 - `INTERVAL`: **60**: Garbage Collection interval (sec), for memory cache only.
 - `HOST`: **\<empty\>**: Connection string for `redis` and `memcache`.
@@ -392,6 +393,7 @@ relation to port exhaustion.
 
 ## Cache - LastCommitCache settings (`cache.last_commit`)
 
+- `ENABLED`: **true**: Enable the cache.
 - `ITEM_TTL`: **16h**: Time to keep items in cache if not used, Setting it to 0 disables caching.
 - `COMMITS_COUNT`: **1000**: Only enable the cache when repository's commits count great than.
 

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

@@ -148,6 +148,7 @@ menu:
 
 ## Cache (`cache`)
 
+- `ENABLED`: **true**: 是否启用。
 - `ADAPTER`: **memory**: 缓存引擎，可以为 `memory`, `redis` 或 `memcache`。
 - `INTERVAL`: **60**: 只对内存缓存有效，GC间隔，单位秒。
 - `HOST`: **\<empty\>**: 针对redis和memcache有效，主机地址和端口。
@@ -157,6 +158,7 @@ menu:
 
 ## Cache - LastCommitCache settings (`cache.last_commit`)
 
+- `ENABLED`: **true**: 是否启用。
 - `ITEM_TTL`: **86400h**: 缓存项目失效时间，设置为 0 则禁用缓存。
 - `COMMITS_COUNT`: **1000**: 仅当仓库的提交数大于时才启用缓存。
 

modules/cache/cache.go

@@ -32,7 +32,7 @@ func newCache(cacheConfig setting.Cache) (mc.Cache, error) {
 func NewContext() error {
 	var err error
 
-	if conn == nil && setting.CacheService.TTL > 0 {
+	if conn == nil && setting.CacheService.Enabled {
 		if conn, err = newCache(setting.CacheService.Cache); err != nil {
 			return err
 		}

modules/cache/last_commit.go

@@ -36,7 +36,7 @@ func NewLastCommitCache(repoPath string, gitRepo *git.Repository, ttl int64) *La
 
 // Get get the last commit information by commit id and entry path
 func (c LastCommitCache) Get(ref, entryPath string) (*object.Commit, error) {
-	v := c.Cache.Get(fmt.Sprintf("lastcommit:%s:%s:%s", c.repoPath, ref, entryPath))
+	v := c.Cache.Get(fmt.Sprintf("last_commit:%s:%s:%s", c.repoPath, ref, entryPath))
 	if vs, ok := v.(string); ok {
 		log.Trace("LastCommitCache hit level 1: [%s:%s:%s]", ref, entryPath, vs)
 		if commit, ok := c.commitCache[vs]; ok {
@@ -60,5 +60,5 @@ func (c LastCommitCache) Get(ref, entryPath string) (*object.Commit, error) {
 // Put put the last commit id with commit and entry path
 func (c LastCommitCache) Put(ref, entryPath, commitID string) error {
 	log.Trace("LastCommitCache save: [%s:%s:%s]", ref, entryPath, commitID)
-	return c.Cache.Put(fmt.Sprintf("lastcommit:%s:%s:%s", c.repoPath, ref, entryPath), commitID, c.ttl)
+	return c.Cache.Put(fmt.Sprintf("last_commit:%s:%s:%s", c.repoPath, ref, entryPath), commitID, c.ttl)
 }

modules/setting/cache.go

@@ -13,6 +13,7 @@ import (
 
 // Cache represents cache settings
 type Cache struct {
+	Enabled  bool
 	Adapter  string
 	Interval int
 	Conn     string
@@ -25,19 +26,23 @@ var (
 		Cache
 
 		LastCommit struct {
+			Enabled      bool
 			TTL          time.Duration `ini:"ITEM_TTL"`
 			CommitsCount int64
 		} `ini:"cache.last_commit"`
 	}{
 		Cache: Cache{
+			Enabled:  true,
 			Adapter:  "memory",
 			Interval: 60,
 			TTL:      16 * time.Hour,
 		},
 		LastCommit: struct {
+			Enabled      bool
 			TTL          time.Duration `ini:"ITEM_TTL"`
 			CommitsCount int64
 		}{
+			Enabled:      true,
 			TTL:          16 * time.Hour,
 			CommitsCount: 1000,
 		},
@@ -56,23 +61,23 @@ func newCacheService() {
 	case "redis", "memcache":
 		CacheService.Conn = strings.Trim(sec.Key("HOST").String(), "\" ")
 	case "": // disable cache
-		CacheService.TTL = 0
+		CacheService.Enabled = false
 	default:
 		log.Fatal("Unknown cache adapter: %s", CacheService.Adapter)
 	}
 
-	if CacheService.TTL > 0 {
+	if CacheService.Enabled {
 		log.Info("Cache Service Enabled")
 	}
 
 	sec = Cfg.Section("cache.last_commit")
-	if CacheService.TTL == 0 {
-		CacheService.LastCommit.TTL = 0
+	if !CacheService.Enabled {
+		CacheService.LastCommit.Enabled = false
 	}
 
 	CacheService.LastCommit.CommitsCount = sec.Key("COMMITS_COUNT").MustInt64(1000)
 
-	if CacheService.LastCommit.TTL > 0 {
+	if CacheService.LastCommit.Enabled {
 		log.Info("Last Commit Cache Service Enabled")
 	}
 }

routers/repo/view.go

@@ -51,7 +51,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
 	entries.CustomSort(base.NaturalSortLess)
 
 	var c git.LastCommitCache
-	if setting.CacheService.LastCommit.TTL > 0 && ctx.Repo.CommitsCount >= setting.CacheService.LastCommit.CommitsCount {
+	if setting.CacheService.LastCommit.Enabled && ctx.Repo.CommitsCount >= setting.CacheService.LastCommit.CommitsCount {
 		c = cache.NewLastCommitCache(ctx.Repo.Repository.FullName(), ctx.Repo.GitRepo, int64(setting.CacheService.LastCommit.TTL.Seconds()))
 	}