Browse Source

Fix typo CacheInternal -> CacheInterval (#3432)

for-closed-social
Thibault Meyer 8 years ago
committed by 无闻
parent
commit
6a81632e36
4 changed files with 5 additions and 5 deletions
  1. +1
    -1
      cmd/web.go
  2. +2
    -2
      modules/setting/setting.go
  3. +1
    -1
      routers/admin/admin.go
  4. +1
    -1
      templates/admin/config.tmpl

+ 1
- 1
cmd/web.go View File

@ -157,7 +157,7 @@ func newMacaron() *macaron.Macaron {
m.Use(cache.Cacher(cache.Options{
Adapter: setting.CacheAdapter,
AdapterConfig: setting.CacheConn,
Interval: setting.CacheInternal,
Interval: setting.CacheInterval,
}))
m.Use(captcha.Captchaer(captcha.Options{
SubURL: setting.AppSubUrl,

+ 2
- 2
modules/setting/setting.go View File

@ -164,7 +164,7 @@ var (
// Cache settings
CacheAdapter string
CacheInternal int
CacheInterval int
CacheConn string
// Session settings
@ -645,7 +645,7 @@ func newCacheService() {
CacheAdapter = Cfg.Section("cache").Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"})
switch CacheAdapter {
case "memory":
CacheInternal = Cfg.Section("cache").Key("INTERVAL").MustInt(60)
CacheInterval = Cfg.Section("cache").Key("INTERVAL").MustInt(60)
case "redis", "memcache":
CacheConn = strings.Trim(Cfg.Section("cache").Key("HOST").String(), "\" ")
default:

+ 1
- 1
routers/admin/admin.go View File

@ -216,7 +216,7 @@ func Config(ctx *context.Context) {
}
ctx.Data["CacheAdapter"] = setting.CacheAdapter
ctx.Data["CacheInternal"] = setting.CacheInternal
ctx.Data["CacheInterval"] = setting.CacheInterval
ctx.Data["CacheConn"] = setting.CacheConn
ctx.Data["SessionConfig"] = setting.SessionConfig

+ 1
- 1
templates/admin/config.tmpl View File

@ -178,7 +178,7 @@
<dt>{{.i18n.Tr "admin.config.cache_adapter"}}</dt>
<dd>{{.CacheAdapter}}</dd>
<dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt>
<dd>{{.CacheInternal}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
<dd>{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
{{if .CacheConn}}
<dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt>
<dd><code>{{.CacheConn}}</code></dd>

Loading…
Cancel
Save