IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

memcache -> memcached

Browse Source 
https://github.com/memcached/memcached
This commit is contained in:
bergquist
2019-03-05 14:35:36 +01:00
parent 995647be2c
commit 98f5432659
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conf/defaults.ini
View File

@@ -108,7 +108,7 @@ cache_mode = private
#################################### Cache server #############################
[cache_server]
# Either "memory", "redis", "memcache" or "database" default is "database"
# Either "memory", "redis", "memcached" or "database" default is "database"
type = database
# cache connectionstring options

4
pkg/infra/distcache/distcache.go
View File

@@ -36,8 +36,8 @@ func createClient(opts *setting.CacheOpts, sqlstore *sqlstore.SqlStore) cacheSto
return newRedisStorage(opts)
}
if opts.Name == "memcache" {
return newMemcacheStorage(opts)
if opts.Name == "memcached" {
return newMemcachedStorage(opts)
}
return newDatabaseCache(sqlstore)

12
pkg/infra/distcache/memcached_storage.go
View File

@@ -7,12 +7,12 @@ import (
"github.com/grafana/grafana/pkg/setting"
)
type memcacheStorage struct {
type memcachedStorage struct {
c *memcache.Client
}
func newMemcacheStorage(opts *setting.CacheOpts) *memcacheStorage {
return &memcacheStorage{
func newMemcachedStorage(opts *setting.CacheOpts) *memcachedStorage {
return &memcachedStorage{
c: memcache.New(opts.ConnStr),
}
}
@@ -26,7 +26,7 @@ func newItem(sid string, data []byte, expire int32) *memcache.Item {
}
// Put sets value to given key in the cache.
func (s *memcacheStorage) Put(key string, val interface{}, expires time.Duration) error {
func (s *memcachedStorage) Put(key string, val interface{}, expires time.Duration) error {
item := &cachedItem{Val: val}
bytes, err := encodeGob(item)
@@ -40,7 +40,7 @@ func (s *memcacheStorage) Put(key string, val interface{}, expires time.Duration
}
// Get gets value by given key in the cache.
func (s *memcacheStorage) Get(key string) (interface{}, error) {
func (s *memcachedStorage) Get(key string) (interface{}, error) {
i, err := s.c.Get(key)
if err != nil && err.Error() == "memcache: cache miss" {
@@ -62,6 +62,6 @@ func (s *memcacheStorage) Get(key string) (interface{}, error) {
}
// Delete delete a key from the cache
func (s *memcacheStorage) Delete(key string) error {
func (s *memcachedStorage) Delete(key string) error {
return s.c.Delete(key)
}

2
pkg/infra/distcache/memcached_storage_integration_test.go
View File

@@ -9,6 +9,6 @@ import (
)
func TestMemcachedCacheStorage(t *testing.T) {
opts := &setting.CacheOpts{Name: "memcache", ConnStr: "localhost:11211"}
opts := &setting.CacheOpts{Name: "memcached", ConnStr: "localhost:11211"}
runTestsForClient(t, createTestClient(t, opts, nil))
}