update handle memory cleanup properly

Author: ochom

cache/cache.go

@@ -16,7 +16,6 @@ type Cache interface {
 	setWithExpiry(key string, value []byte, expiry time.Duration) error
 	get(key string) []byte
 	delete(key string) error
-	cleanUp()
 }
 
 var conn Cache
@@ -32,7 +31,6 @@ func init() {
 		panic("unknown cache driver")
 	}
 
-	go conn.cleanUp()
 }
 
 // Client ...
@@ -64,11 +62,3 @@ func Get[T any](key string) (T, error) {
 func Delete(key string) error {
 	return conn.delete(key)
 }
-
-// CleanUp ...
-func CleanUp() {
-	tick := time.NewTicker(time.Second)
-	for range tick.C {
-		conn.cleanUp()
-	}
-}

cache/memory.go

@@ -17,11 +17,14 @@ type memoryCache struct {
 }
 
 func newMemoryCache() Cache {
-	return &memoryCache{
+	c := &memoryCache{
 		cacheWorkers: env.Int("CACHE_TOTAL_WORKERS", 10),
 		items:        make(map[string]cacheItem),
 		mut:          sync.Mutex{},
 	}
+
+	go c.cleanUp()
+	return c
 }
 
 // getClient ...
@@ -77,11 +80,15 @@ func (m *memoryCache) delete(key string) error {
 
 // cleanUp deletes expired cache items and calls their callbacks
 func (m *memoryCache) cleanUp() {
-	m.mut.Lock()
-	defer m.mut.Unlock()
-	for key, item := range m.items {
-		if item.expired() {
-			delete(m.items, key)
+	for {
+		m.mut.Lock()
+		for key, item := range m.items {
+			if item.expired() {
+				delete(m.items, key)
+			}
 		}
+
+		m.mut.Unlock()
+		<-time.After(time.Second)
 	}
 }

cache/redis.go

@@ -78,7 +78,3 @@ func (r *redisCache) delete(key string) error {
 
 	return nil
 }
-
-func (r *redisCache) cleanUp() {
-	// TODO
-}