Browse Source

remove tags redis and memcache

Unknwon 9 years ago
parent
commit
3623b0927e
3 changed files with 4 additions and 43 deletions
  1. 4 12
      modules/setting/setting.go
  2. 0 15
      modules/setting/setting_memcache.go
  3. 0 16
      modules/setting/setting_redis.go

+ 4 - 12
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)

+ 0 - 15
modules/setting/setting_memcache.go

@@ -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
-}

+ 0 - 16
modules/setting/setting_redis.go

@@ -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
-}