Kyle Brandt
91feb80187
* wip: fix remote cache for redis
connstr parsing and non-negative expires for #17377
TODO: finish parse, check zero case, find out why negative duration in the first place
* finish parse.
Still TODO, find out negative value, and decide if would be better to make database specific entries in the .ini file
* update ini files
* remove accidental uncomment in defaults.ini
* auth_proxy: expiration non-negative so expiration is not in the past
* fix test, revert neg in redis
* review: use errutil
(cherry picked from commit c09fe3c3b4)
101 lines
2.4 KiB
Go
101 lines
2.4 KiB
Go
package remotecache
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/grafana/grafana/pkg/setting"
|
|
"github.com/grafana/grafana/pkg/util/errutil"
|
|
redis "gopkg.in/redis.v2"
|
|
)
|
|
|
|
const redisCacheType = "redis"
|
|
|
|
type redisStorage struct {
|
|
c *redis.Client
|
|
}
|
|
|
|
// parseRedisConnStr parses k=v pairs in csv and builds a redis Options object
|
|
func parseRedisConnStr(connStr string) (*redis.Options, error) {
|
|
keyValueCSV := strings.Split(connStr, ",")
|
|
options := &redis.Options{Network: "tcp"}
|
|
for _, rawKeyValue := range keyValueCSV {
|
|
keyValueTuple := strings.Split(rawKeyValue, "=")
|
|
if len(keyValueTuple) != 2 {
|
|
return nil, fmt.Errorf("incorrect redis connection string format detected for '%v', format is key=value,key=value", rawKeyValue)
|
|
}
|
|
connKey := keyValueTuple[0]
|
|
connVal := keyValueTuple[1]
|
|
switch connKey {
|
|
case "addr":
|
|
options.Addr = connVal
|
|
case "password":
|
|
options.Password = connVal
|
|
case "db":
|
|
i, err := strconv.ParseInt(connVal, 10, 64)
|
|
if err != nil {
|
|
return nil, errutil.Wrap("value for db in redis connection string must be a number", err)
|
|
}
|
|
options.DB = i
|
|
case "pool_size":
|
|
i, err := strconv.Atoi(connVal)
|
|
if err != nil {
|
|
return nil, errutil.Wrap("value for pool_size in redis connection string must be a number", err)
|
|
}
|
|
options.PoolSize = i
|
|
default:
|
|
return nil, fmt.Errorf("unrecorgnized option '%v' in redis connection string", connVal)
|
|
}
|
|
}
|
|
return options, nil
|
|
}
|
|
|
|
func newRedisStorage(opts *setting.RemoteCacheOptions) (*redisStorage, error) {
|
|
opt, err := parseRedisConnStr(opts.ConnStr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &redisStorage{c: redis.NewClient(opt)}, nil
|
|
}
|
|
|
|
// Set sets value to given key in session.
|
|
func (s *redisStorage) Set(key string, val interface{}, expires time.Duration) error {
|
|
item := &cachedItem{Val: val}
|
|
value, err := encodeGob(item)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
status := s.c.SetEx(key, expires, string(value))
|
|
return status.Err()
|
|
}
|
|
|
|
// Get gets value by given key in session.
|
|
func (s *redisStorage) Get(key string) (interface{}, error) {
|
|
v := s.c.Get(key)
|
|
|
|
item := &cachedItem{}
|
|
err := decodeGob([]byte(v.Val()), item)
|
|
|
|
if err == nil {
|
|
return item.Val, nil
|
|
}
|
|
|
|
if err.Error() == "EOF" {
|
|
return nil, ErrCacheItemNotFound
|
|
}
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return item.Val, nil
|
|
}
|
|
|
|
// Delete delete a key from session.
|
|
func (s *redisStorage) Delete(key string) error {
|
|
cmd := s.c.Del(key)
|
|
return cmd.Err()
|
|
}
|