Allow common redis and leveldb connections (#12385)

* Allow common redis and leveldb connections

Prevents multiple reopening of redis and leveldb connections to the same
place by sharing connections.

Further allows for more configurable redis connection type using the
redisURI and a leveldbURI scheme.

Signed-off-by: Andrew Thornton <art27@cantab.net>

* add unit-test

Signed-off-by: Andrew Thornton <art27@cantab.net>

* as per @lunny

Signed-off-by: Andrew Thornton <art27@cantab.net>

* add test

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Update modules/cache/cache_redis.go

* Update modules/queue/queue_disk.go

* Update modules/cache/cache_redis.go

* Update modules/cache/cache_redis.go

* Update modules/queue/unique_queue_disk.go

* Update modules/queue/queue_disk.go

* Update modules/queue/unique_queue_disk.go

* Update modules/session/redis.go

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lauris BH <lauris@nix.lv>

4 files changed, 0 insertions, 419 deletions

diff --git a/vendor/gitea.com/macaron/cache/redis/redis.go b/vendor/gitea.com/macaron/cache/redis/redis.go
deleted file mode 100644
index 892ee28bdc..0000000000
--- a/vendor/gitea.com/macaron/cache/redis/redis.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2013 Beego Authors
-// Copyright 2014 The Macaron Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package cache
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/go-redis/redis"
-	"github.com/unknwon/com"
-	"gopkg.in/ini.v1"
-
-	"gitea.com/macaron/cache"
-)
-
-// RedisCacher represents a redis cache adapter implementation.
-type RedisCacher struct {
-	c          *redis.Client
-	prefix     string
-	hsetName   string
-	occupyMode bool
-}
-
-// Put puts value into cache with key and expire time.
-// If expired is 0, it lives forever.
-func (c *RedisCacher) Put(key string, val interface{}, expire int64) error {
-	key = c.prefix + key
-	if expire == 0 {
-		if err := c.c.Set(key, com.ToStr(val), 0).Err(); err != nil {
-			return err
-		}
-	} else {
-		dur, err := time.ParseDuration(com.ToStr(expire) + "s")
-		if err != nil {
-			return err
-		}
-		if err = c.c.Set(key, com.ToStr(val), dur).Err(); err != nil {
-			return err
-		}
-	}
-
-	if c.occupyMode {
-		return nil
-	}
-	return c.c.HSet(c.hsetName, key, "0").Err()
-}
-
-// Get gets cached value by given key.
-func (c *RedisCacher) Get(key string) interface{} {
-	val, err := c.c.Get(c.prefix + key).Result()
-	if err != nil {
-		return nil
-	}
-	return val
-}
-
-// Delete deletes cached value by given key.
-func (c *RedisCacher) Delete(key string) error {
-	key = c.prefix + key
-	if err := c.c.Del(key).Err(); err != nil {
-		return err
-	}
-
-	if c.occupyMode {
-		return nil
-	}
-	return c.c.HDel(c.hsetName, key).Err()
-}
-
-// Incr increases cached int-type value by given key as a counter.
-func (c *RedisCacher) Incr(key string) error {
-	if !c.IsExist(key) {
-		return fmt.Errorf("key '%s' not exist", key)
-	}
-	return c.c.Incr(c.prefix + key).Err()
-}
-
-// Decr decreases cached int-type value by given key as a counter.
-func (c *RedisCacher) Decr(key string) error {
-	if !c.IsExist(key) {
-		return fmt.Errorf("key '%s' not exist", key)
-	}
-	return c.c.Decr(c.prefix + key).Err()
-}
-
-// IsExist returns true if cached value exists.
-func (c *RedisCacher) IsExist(key string) bool {
-	if c.c.Exists(c.prefix+key).Val() == 1 {
-		return true
-	}
-
-	if !c.occupyMode {
-		c.c.HDel(c.hsetName, c.prefix+key)
-	}
-	return false
-}
-
-// Flush deletes all cached data.
-func (c *RedisCacher) Flush() error {
-	if c.occupyMode {
-		return c.c.FlushDb().Err()
-	}
-
-	keys, err := c.c.HKeys(c.hsetName).Result()
-	if err != nil {
-		return err
-	}
-	if err = c.c.Del(keys...).Err(); err != nil {
-		return err
-	}
-	return c.c.Del(c.hsetName).Err()
-}
-
-// StartAndGC starts GC routine based on config string settings.
-// AdapterConfig: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180,hset_name=MacaronCache,prefix=cache:
-func (c *RedisCacher) StartAndGC(opts cache.Options) error {
-	c.hsetName = "MacaronCache"
-	c.occupyMode = opts.OccupyMode
-
-	cfg, err := ini.Load([]byte(strings.Replace(opts.AdapterConfig, ",", "\n", -1)))
-	if err != nil {
-		return err
-	}
-
-	opt := &redis.Options{
-		Network: "tcp",
-	}
-	for k, v := range cfg.Section("").KeysHash() {
-		switch k {
-		case "network":
-			opt.Network = v
-		case "addr":
-			opt.Addr = v
-		case "password":
-			opt.Password = v
-		case "db":
-			opt.DB = com.StrTo(v).MustInt()
-		case "pool_size":
-			opt.PoolSize = com.StrTo(v).MustInt()
-		case "idle_timeout":
-			opt.IdleTimeout, err = time.ParseDuration(v + "s")
-			if err != nil {
-				return fmt.Errorf("error parsing idle timeout: %v", err)
-			}
-		case "hset_name":
-			c.hsetName = v
-		case "prefix":
-			c.prefix = v
-		default:
-			return fmt.Errorf("session/redis: unsupported option '%s'", k)
-		}
-	}
-
-	c.c = redis.NewClient(opt)
-	if err = c.c.Ping().Err(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func init() {
-	cache.Register("redis", &RedisCacher{})
-}
diff --git a/vendor/gitea.com/macaron/cache/redis/redis.goconvey b/vendor/gitea.com/macaron/cache/redis/redis.goconvey
deleted file mode 100644
index 8485e986e4..0000000000
--- a/vendor/gitea.com/macaron/cache/redis/redis.goconvey
+++ /dev/null
@@ -1 +0,0 @@
-ignore
\ No newline at end of file
diff --git a/vendor/gitea.com/macaron/session/redis/redis.go b/vendor/gitea.com/macaron/session/redis/redis.go
deleted file mode 100644
index 5f242d6b37..0000000000
--- a/vendor/gitea.com/macaron/session/redis/redis.go
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright 2013 Beego Authors
-// Copyright 2014 The Macaron Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package session
-
-import (
-	"fmt"
-	"strings"
-	"sync"
-	"time"
-
-	"gitea.com/macaron/session"
-	"github.com/go-redis/redis"
-	"github.com/unknwon/com"
-	"gopkg.in/ini.v1"
-)
-
-// RedisStore represents a redis session store implementation.
-type RedisStore struct {
-	c           *redis.Client
-	prefix, sid string
-	duration    time.Duration
-	lock        sync.RWMutex
-	data        map[interface{}]interface{}
-}
-
-// NewRedisStore creates and returns a redis session store.
-func NewRedisStore(c *redis.Client, prefix, sid string, dur time.Duration, kv map[interface{}]interface{}) *RedisStore {
-	return &RedisStore{
-		c:        c,
-		prefix:   prefix,
-		sid:      sid,
-		duration: dur,
-		data:     kv,
-	}
-}
-
-// Set sets value to given key in session.
-func (s *RedisStore) Set(key, val interface{}) error {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	s.data[key] = val
-	return nil
-}
-
-// Get gets value by given key in session.
-func (s *RedisStore) Get(key interface{}) interface{} {
-	s.lock.RLock()
-	defer s.lock.RUnlock()
-
-	return s.data[key]
-}
-
-// Delete delete a key from session.
-func (s *RedisStore) Delete(key interface{}) error {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	delete(s.data, key)
-	return nil
-}
-
-// ID returns current session ID.
-func (s *RedisStore) ID() string {
-	return s.sid
-}
-
-// Release releases resource and save data to provider.
-func (s *RedisStore) Release() error {
-	// Skip encoding if the data is empty
-	if len(s.data) == 0 {
-		return nil
-	}
-
-	data, err := session.EncodeGob(s.data)
-	if err != nil {
-		return err
-	}
-
-	return s.c.Set(s.prefix+s.sid, string(data), s.duration).Err()
-}
-
-// Flush deletes all session data.
-func (s *RedisStore) Flush() error {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	s.data = make(map[interface{}]interface{})
-	return nil
-}
-
-// RedisProvider represents a redis session provider implementation.
-type RedisProvider struct {
-	c        *redis.Client
-	duration time.Duration
-	prefix   string
-}
-
-// Init initializes redis session provider.
-// configs: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180,prefix=session;
-func (p *RedisProvider) Init(maxlifetime int64, configs string) (err error) {
-	p.duration, err = time.ParseDuration(fmt.Sprintf("%ds", maxlifetime))
-	if err != nil {
-		return err
-	}
-
-	cfg, err := ini.Load([]byte(strings.Replace(configs, ",", "\n", -1)))
-	if err != nil {
-		return err
-	}
-
-	opt := &redis.Options{
-		Network: "tcp",
-	}
-	for k, v := range cfg.Section("").KeysHash() {
-		switch k {
-		case "network":
-			opt.Network = v
-		case "addr":
-			opt.Addr = v
-		case "password":
-			opt.Password = v
-		case "db":
-			opt.DB = com.StrTo(v).MustInt()
-		case "pool_size":
-			opt.PoolSize = com.StrTo(v).MustInt()
-		case "idle_timeout":
-			opt.IdleTimeout, err = time.ParseDuration(v + "s")
-			if err != nil {
-				return fmt.Errorf("error parsing idle timeout: %v", err)
-			}
-		case "prefix":
-			p.prefix = v
-		default:
-			return fmt.Errorf("session/redis: unsupported option '%s'", k)
-		}
-	}
-
-	p.c = redis.NewClient(opt)
-	return p.c.Ping().Err()
-}
-
-// Read returns raw session store by session ID.
-func (p *RedisProvider) Read(sid string) (session.RawStore, error) {
-	psid := p.prefix + sid
-	if !p.Exist(sid) {
-		if err := p.c.Set(psid, "", p.duration).Err(); err != nil {
-			return nil, err
-		}
-	}
-
-	var kv map[interface{}]interface{}
-	kvs, err := p.c.Get(psid).Result()
-	if err != nil {
-		return nil, err
-	}
-	if len(kvs) == 0 {
-		kv = make(map[interface{}]interface{})
-	} else {
-		kv, err = session.DecodeGob([]byte(kvs))
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return NewRedisStore(p.c, p.prefix, sid, p.duration, kv), nil
-}
-
-// Exist returns true if session with given ID exists.
-func (p *RedisProvider) Exist(sid string) bool {
-	v, err := p.c.Exists(p.prefix + sid).Result()
-	return err == nil && v == 1
-}
-
-// Destroy deletes a session by session ID.
-func (p *RedisProvider) Destroy(sid string) error {
-	return p.c.Del(p.prefix + sid).Err()
-}
-
-// Regenerate regenerates a session store from old session ID to new one.
-func (p *RedisProvider) Regenerate(oldsid, sid string) (_ session.RawStore, err error) {
-	poldsid := p.prefix + oldsid
-	psid := p.prefix + sid
-
-	if p.Exist(sid) {
-		return nil, fmt.Errorf("new sid '%s' already exists", sid)
-	} else if !p.Exist(oldsid) {
-		// Make a fake old session.
-		if err = p.c.Set(poldsid, "", p.duration).Err(); err != nil {
-			return nil, err
-		}
-	}
-
-	if err = p.c.Rename(poldsid, psid).Err(); err != nil {
-		return nil, err
-	}
-
-	var kv map[interface{}]interface{}
-	kvs, err := p.c.Get(psid).Result()
-	if err != nil {
-		return nil, err
-	}
-
-	if len(kvs) == 0 {
-		kv = make(map[interface{}]interface{})
-	} else {
-		kv, err = session.DecodeGob([]byte(kvs))
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return NewRedisStore(p.c, p.prefix, sid, p.duration, kv), nil
-}
-
-// Count counts and returns number of sessions.
-func (p *RedisProvider) Count() int {
-	return int(p.c.DbSize().Val())
-}
-
-// GC calls GC to clean expired sessions.
-func (_ *RedisProvider) GC() {}
-
-func init() {
-	session.Register("redis", &RedisProvider{})
-}
diff --git a/vendor/gitea.com/macaron/session/redis/redis.goconvey b/vendor/gitea.com/macaron/session/redis/redis.goconvey
deleted file mode 100644
index 8485e986e4..0000000000
--- a/vendor/gitea.com/macaron/session/redis/redis.goconvey
+++ /dev/null
@@ -1 +0,0 @@
-ignore
\ No newline at end of file