Default use default cache configuration

Author: lunny

custom/conf/app.ini.sample

@@ -650,6 +650,8 @@ ITEM_TTL = 16h
 [cache.last_commit]
 ; if the cache enabled
 ENABLED = true
+; if use the default cache, by pass all the next options
+USE_SEPERATE_CACHE = false
 ; Either "memory", "redis", or "memcache", default is "memory"
 ADAPTER = memory
 ; For "memory" only, GC interval in seconds, default is 60

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

@@ -394,6 +394,7 @@ relation to port exhaustion.
 ## Cache - LastCommitCache settings (`cache.last_commit`)
 
 - `ENABLED`: **true**: Enable the cache.
+- `USE_SEPERATE_CACHE`: **false** If use a seperate cache setting, `false` will bypass all the next options.
 - `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`.

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

@@ -159,6 +159,7 @@ menu:
 ## Cache - LastCommitCache settings (`cache.last_commit`)
 
 - `ENABLED`: **true**: 是否启用。
+- `USE_SEPERATE_CACHE`: **false** 是否启用独立的Cache设置，如果为否，则以下的Cache设置无效。
 - `ADAPTER`: **memory**: 缓存引擎，可以为 `memory`, `redis` 或 `memcache`。
 - `INTERVAL`: **60**: 只对内存缓存有效，GC间隔，单位秒。
 - `HOST`: **\<empty\>**: 针对redis和memcache有效，主机地址和端口。

modules/cache/last_commit.go

@@ -34,6 +34,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("%s:%s:%s", c.repoPath, ref, entryPath))
 	if vs, ok := v.(string); ok {
@@ -56,6 +57,7 @@ func (c LastCommitCache) Get(ref, entryPath string) (*object.Commit, error) {
 	return nil, nil
 }
 
+// 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("%s:%s:%s", c.repoPath, ref, entryPath), commitID, c.ttl)

modules/setting/cache.go

@@ -27,7 +27,8 @@ var (
 
 		LastCommit struct {
 			Cache
-			CommitsCount int64
+			UseSeperateCache bool
+			CommitsCount     int64
 		} `ini:"cache.last_commit"`
 	}{
 		Cache: Cache{
@@ -38,15 +39,17 @@ var (
 		},
 		LastCommit: struct {
 			Cache
-			CommitsCount int64
+			UseSeperateCache bool
+			CommitsCount     int64
 		}{
 			Cache: Cache{
 				Enabled:  true,
 				Adapter:  "memory",
 				Interval: 60,
 				TTL:      86400 * time.Hour,
 			},
-			CommitsCount: 1000,
+			UseSeperateCache: false,
+			CommitsCount:     1000,
 		},
 	}
 )
@@ -73,16 +76,19 @@ func newCacheService() {
 	}
 
 	sec = Cfg.Section("cache.last_commit")
-
-	CacheService.LastCommit.Adapter = sec.Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"})
-	switch CacheService.LastCommit.Adapter {
-	case "memory":
-	case "redis", "memcache":
-		CacheService.LastCommit.Conn = strings.Trim(sec.Key("HOST").String(), "\" ")
-	case "": // disable cache
-		CacheService.LastCommit.Enabled = false
-	default:
-		log.Fatal("Unknown cache.last_commit adapter: %s", CacheService.LastCommit.Adapter)
+	if !CacheService.LastCommit.UseSeperateCache {
+		CacheService.LastCommit.Cache = CacheService.Cache
+	} else {
+		CacheService.LastCommit.Adapter = sec.Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"})
+		switch CacheService.LastCommit.Adapter {
+		case "memory":
+		case "redis", "memcache":
+			CacheService.LastCommit.Conn = strings.Trim(sec.Key("HOST").String(), "\" ")
+		case "": // disable cache
+			CacheService.LastCommit.Enabled = false
+		default:
+			log.Fatal("Unknown cache.last_commit adapter: %s", CacheService.LastCommit.Adapter)
+		}
 	}
 
 	CacheService.LastCommit.CommitsCount = sec.Key("COMMITS_COUNT").MustInt64(1000)