From 8db2864feef388f9ee1894c84783e5d05ff61a60 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Sun, 3 Mar 2019 05:25:17 +0100
Subject: [PATCH] adds memory as dist storage alt

---
 .../database_storage_integration_test.go      | 12 +++++++
 pkg/infra/distcache/distcache.go              |  6 ++--
 pkg/infra/distcache/distcache_test.go         |  3 +-
 pkg/infra/distcache/memcached_storage_test.go | 12 +++++++
 pkg/infra/distcache/memory_storage.go         | 35 +++++++++++++++++++
 5 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 pkg/infra/distcache/database_storage_integration_test.go
 create mode 100644 pkg/infra/distcache/memcached_storage_test.go
 create mode 100644 pkg/infra/distcache/memory_storage.go

diff --git a/pkg/infra/distcache/database_storage_integration_test.go b/pkg/infra/distcache/database_storage_integration_test.go
new file mode 100644
index 00000000000..e305759983d
--- /dev/null
+++ b/pkg/infra/distcache/database_storage_integration_test.go
@@ -0,0 +1,12 @@
+package distcache
+
+import "testing"
+
+func TestIntegrationDatabaseCacheStorage(t *testing.T) {
+
+	client := createTestClient(t, "database")
+
+	CanPutGetAndDeleteCachedObjects(t, client)
+	CanNotFetchExpiredItems(t, client)
+	CanSetInfiniteCacheExpiration(t, client)
+}
diff --git a/pkg/infra/distcache/distcache.go b/pkg/infra/distcache/distcache.go
index 87a6da45029..d21ada1e6a3 100644
--- a/pkg/infra/distcache/distcache.go
+++ b/pkg/infra/distcache/distcache.go
@@ -48,9 +48,9 @@ func createClient(opts CacheOpts, sqlstore *sqlstore.SqlStore) cacheStorage {
 		return newMemcacheStorage("localhost:11211")
 	}
 
-	// if opts.name == "memory" {
-	// 	return nil
-	// }
+	if opts.name == "memory" {
+		return newMemoryStorage()
+	}
 
 	return newDatabaseCache(sqlstore)
 }
diff --git a/pkg/infra/distcache/distcache_test.go b/pkg/infra/distcache/distcache_test.go
index af6f426e1c0..ec778b0c335 100644
--- a/pkg/infra/distcache/distcache_test.go
+++ b/pkg/infra/distcache/distcache_test.go
@@ -27,8 +27,7 @@ func createTestClient(t *testing.T, name string) cacheStorage {
 }
 
 func TestAllCacheClients(t *testing.T) {
-	//clients := []string{"database", "redis", "memcache"} // add redis, memcache, memory
-	clients := []string{} // add redis, memcache, memory
+	clients := []string{"memory"} // add redis, memcache, memory
 
 	for _, v := range clients {
 		client := createTestClient(t, v)
diff --git a/pkg/infra/distcache/memcached_storage_test.go b/pkg/infra/distcache/memcached_storage_test.go
new file mode 100644
index 00000000000..b02f67f062f
--- /dev/null
+++ b/pkg/infra/distcache/memcached_storage_test.go
@@ -0,0 +1,12 @@
+package distcache
+
+import "testing"
+
+func TestMemcachedCacheStorage(t *testing.T) {
+
+	client := createTestClient(t, "memcache")
+
+	CanPutGetAndDeleteCachedObjects(t, client)
+	CanNotFetchExpiredItems(t, client)
+	CanSetInfiniteCacheExpiration(t, client)
+}
diff --git a/pkg/infra/distcache/memory_storage.go b/pkg/infra/distcache/memory_storage.go
new file mode 100644
index 00000000000..a1203cabe75
--- /dev/null
+++ b/pkg/infra/distcache/memory_storage.go
@@ -0,0 +1,35 @@
+package distcache
+
+import (
+	"time"
+
+	gocache "github.com/patrickmn/go-cache"
+)
+
+type memoryStorage struct {
+	c *gocache.Cache
+}
+
+func newMemoryStorage() *memoryStorage {
+	return &memoryStorage{
+		c: gocache.New(time.Minute*30, time.Minute*30),
+	}
+}
+
+func (s *memoryStorage) Put(key string, val interface{}, expires time.Duration) error {
+	return s.c.Add(key, val, expires)
+}
+
+func (s *memoryStorage) Get(key string) (interface{}, error) {
+	val, exist := s.c.Get(key)
+	if !exist {
+		return nil, ErrCacheItemNotFound
+	}
+
+	return val, nil
+}
+
+func (s *memoryStorage) Delete(key string) error {
+	s.c.Delete(key)
+	return nil
+}