Prepare for v0.3.0 release

diff --git a/models/models.go b/models/models.go
index 216084f1b8399e2f5a6acc5c9a332d30a15ca514..8e8835ab516e13957546e95e5cc19ce05c1fbd08 100644 (file)
--- a/models/models.go
+++ b/models/models.go
@@ -12,7 +12,6 @@ import (
 
        _ "github.com/go-sql-driver/mysql"
        "github.com/go-xorm/xorm"
-       _ "github.com/gogits/cache"
        _ "github.com/lib/pq"
 
        "github.com/gogits/gogs/modules/base"

diff --git a/modules/base/base_memcache.go b/modules/base/base_memcache.go
new file mode 100644 (file)
index 0000000..93ca93a
--- /dev/null
+++ b/modules/base/base_memcache.go
@@ -0,0 +1,11 @@
+// +build memcache
+
+package base
+
+import (
+       _ "github.com/gogits/cache/memcache"
+)
+
+func init() {
+       EnableMemcache = true
+}

diff --git a/modules/base/base_redis.go b/modules/base/base_redis.go
new file mode 100644 (file)
index 0000000..327af84
--- /dev/null
+++ b/modules/base/base_redis.go
@@ -0,0 +1,11 @@
+// +build redis
+
+package base
+
+import (
+       _ "github.com/gogits/cache/redis"
+)
+
+func init() {
+       EnableRedis = true
+}

diff --git a/modules/base/conf.go b/modules/base/conf.go
index 720b86108408cfcbd899b44d5e924b2751294b04..48ba46583adb351c61a8f33b774b00423c97c3b5 100644 (file)
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -77,6 +77,9 @@ var (
        SessionManager  *session.Manager
 
        PictureService string
+
+       EnableRedis    bool
+       EnableMemcache bool
 )
 
 var Service struct {
@@ -174,10 +177,10 @@ func newLogService() {
 
 func newCacheService() {
        CacheAdapter = Cfg.MustValue("cache", "ADAPTER", "memory")
-       if cache.EnableRedis {
+       if EnableRedis {
                log.Info("Redis Enabled")
        }
-       if cache.EnableMemcache {
+       if EnableMemcache {
                log.Info("Memcache Enabled")
        }