Initial CacheSize vs. CacheMem

cache.go

@@ -9,6 +9,7 @@ type Cache interface {
 	has(username string) bool
 	pull(username string) minecraft.Skin
 	add(username string, skin minecraft.Skin)
+	size() uint
 	memory() uint64
 }
 

cache_memory.go

@@ -1,8 +1,9 @@
 package main
 
 import (
-	"github.com/minotar/minecraft"
 	"time"
+
+	"github.com/minotar/minecraft"
 )
 
 const (
@@ -96,6 +97,11 @@ func (c *CacheMemory) add(username string, skin minecraft.Skin) {
 	})
 }
 
+// The exact number of usernames in the map
+func (c *CacheMemory) size() uint {
+	return uint(len(c.Usernames))
+}
+
 // The byte size of the cache. Fairly rough... don't really want to venture
 // into the land of manual memory management, because there be dragons.
 func (c *CacheMemory) memory() uint64 {

cache_off.go

@@ -25,6 +25,10 @@ func (c *CacheOff) pull(username string) minecraft.Skin {
 func (c *CacheOff) add(username string, skin minecraft.Skin) {
 }
 
+func (c *CacheOff) size() uint {
+	return 0
+}
+
 func (c *CacheOff) memory() uint64 {
 	return 0
 }

cache_redis.go

@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/fzzy/radix/extra/pool"
-	"github.com/fzzy/radix/redis"
-	"github.com/minotar/minecraft"
 	"image/png"
 	"strconv"
 	"strings"
+
+	"github.com/fzzy/radix/extra/pool"
+	"github.com/fzzy/radix/redis"
+	"github.com/minotar/minecraft"
 )
 
 type CacheRedis struct {
@@ -128,6 +129,24 @@ func (c *CacheRedis) remove(username string) {
 	err = client.Cmd("DEL", config.Redis.Prefix+username).Err
 }
 
+func (c *CacheRedis) size() uint {
+	var err error
+	client := c.getFromPool()
+	if client == nil {
+		return 0
+	}
+	defer c.Pool.CarefullyPut(client, &err)
+
+	resp := client.Cmd("DBSIZE")
+	size, err := resp.Int()
+	if err != nil {
+		log.Error(err.Error())
+		return 0
+	}
+
+	return uint(size)
+}
+
 func (c *CacheRedis) memory() uint64 {
 	var err error
 	client := c.getFromPool()

status.go

@@ -34,8 +34,10 @@ type StatusCollector struct {
 		CacheHits uint
 		// Number of times skins have failed to be served from the cache.
 		CacheMisses uint
-		// Size of cached skins
-		Cached uint64
+		// Number of skins in cache.
+		CacheSize uint
+		// Size of cache memory.
+		CacheMem uint64
 	}
 
 	// Unix timestamp the process was booted at.
@@ -98,7 +100,8 @@ func (s *StatusCollector) Collect() {
 
 	s.info.Memory = memstats.Alloc
 	s.info.Uptime = time.Now().Unix() - s.StartedAt
-	s.info.Cached = cache.memory()
+	s.info.CacheSize = cache.size()
+	s.info.CacheMem = cache.memory()
 }
 
 // Increments the request counter for the specific type of request.