From 3623b0927eaaa343014a592b4f663f80b9a513b5 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 21 Nov 2015 17:21:22 -0500 Subject: [PATCH] remove tags redis and memcache --- modules/setting/setting.go | 16 ++++------------ modules/setting/setting_memcache.go | 15 --------------- modules/setting/setting_redis.go | 16 ---------------- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 modules/setting/setting_memcache.go delete mode 100644 modules/setting/setting_redis.go diff --git a/modules/setting/setting.go b/modules/setting/setting.go index c2b56b5b4..a8a31ddc7 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -15,10 +15,12 @@ import ( "strings" "time" - "gopkg.in/ini.v1" - "github.com/Unknwon/com" + _ "github.com/go-macaron/cache/memcache" + _ "github.com/go-macaron/cache/redis" "github.com/go-macaron/session" + _ "github.com/go-macaron/session/redis" + "gopkg.in/ini.v1" "github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/log" @@ -140,9 +142,6 @@ var ( CacheInternal int CacheConn string - EnableRedis bool - EnableMemcache bool - // Session settings. SessionConfig session.Options @@ -545,13 +544,6 @@ func newLogService() { func newCacheService() { CacheAdapter = Cfg.Section("cache").Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"}) - if EnableRedis { - log.Info("Redis Supported") - } - if EnableMemcache { - log.Info("Memcache Supported") - } - switch CacheAdapter { case "memory": CacheInternal = Cfg.Section("cache").Key("INTERVAL").MustInt(60) diff --git a/modules/setting/setting_memcache.go b/modules/setting/setting_memcache.go deleted file mode 100644 index 9a7653b72..000000000 --- a/modules/setting/setting_memcache.go +++ /dev/null @@ -1,15 +0,0 @@ -// +build memcache - -// Copyright 2014 The Gogs Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package setting - -import ( - _ "github.com/go-macaron/cache/memcache" -) - -func init() { - EnableMemcache = true -} diff --git a/modules/setting/setting_redis.go b/modules/setting/setting_redis.go deleted file mode 100644 index e12010cd5..000000000 --- a/modules/setting/setting_redis.go +++ /dev/null @@ -1,16 +0,0 @@ -// +build redis - -// Copyright 2014 The Gogs Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package setting - -import ( - _ "github.com/go-macaron/cache/redis" - _ "github.com/go-macaron/session/redis" -) - -func init() { - EnableRedis = true -}