🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Add logs to cache hunter
Deluanbfaf4a3388d4
diff --git a/utils/cache/file_caches.go b/utils/cache/file_caches.goindex 2125ff82a..b2fe48328 100644--- a/utils/cache/file_caches.go+++ b/utils/cache/file_caches.go@@ -207,7 +207,7 @@ func newFSCache(name, cacheSize, cacheFolder string, maxItems int) (fscache.Cachreturn nil, nil}- lru := NewFileHaunter(maxItems, int64(size), consts.DefaultCacheCleanUpInterval)+ lru := NewFileHaunter(name, maxItems, int64(size), consts.DefaultCacheCleanUpInterval)h := fscache.NewLRUHaunterStrategy(lru)cacheFolder = filepath.Join(conf.Server.DataFolder, cacheFolder)diff --git a/utils/cache/file_haunter.go b/utils/cache/file_haunter.goindex 880332751..22d34c5c6 100644--- a/utils/cache/file_haunter.go+++ b/utils/cache/file_haunter.go@@ -5,6 +5,7 @@ import ("time""github.com/djherbis/fscache"+ "github.com/dustin/go-humanize""github.com/navidrome/navidrome/log")@@ -20,8 +21,9 @@ type haunterKV struct {// If maxItems or maxSize are 0, they won't be checked//// Based on fscache.NewLRUHaunter-func NewFileHaunter(maxItems int, maxSize int64, period time.Duration) fscache.LRUHaunter {+func NewFileHaunter(name string, maxItems int, maxSize int64, period time.Duration) fscache.LRUHaunter {return &fileHaunter{+ name: name,period: period,maxItems: maxItems,maxSize: maxSize,@@ -29,6 +31,7 @@ func NewFileHaunter(maxItems int, maxSize int64, period time.Duration) fscache.L}type fileHaunter struct {+ name stringperiod time.DurationmaxItems intmaxSize int64@@ -43,6 +46,7 @@ func (j *fileHaunter) Scrub(c fscache.CacheAccessor) (keysToReap []string) {var size int64var okFiles []haunterKV+ log.Trace("Running cache cleanup", "cache", j.name, "maxSize", humanize.Bytes(uint64(j.maxSize)))c.EnumerateEntries(func(key string, e fscache.Entry) bool {if e.InUse() {return true@@ -90,6 +94,8 @@ func (j *fileHaunter) Scrub(c fscache.CacheAccessor) (keysToReap []string) {return true}+ log.Trace("Current cache stats", "cache", j.name, "size", humanize.Bytes(uint64(size)), "numItems", count)+if j.maxItems > 0 {for count > j.maxItems {if !collectKeysToReapFn() {@@ -106,6 +112,9 @@ func (j *fileHaunter) Scrub(c fscache.CacheAccessor) (keysToReap []string) {}}+ if len(keysToReap) > 0 {+ log.Trace("Removing items from cache", "cache", j.name, "numItems", len(keysToReap))+ }return keysToReap}diff --git a/utils/cache/file_hauter_test.go b/utils/cache/file_hauter_test.goindex 7b35ee47b..6bdad4a9d 100644--- a/utils/cache/file_hauter_test.go+++ b/utils/cache/file_hauter_test.go@@ -22,7 +22,7 @@ func TestFileHaunterMaxSize(t *testing.T) {}defer os.RemoveAll(tempDir)- c, err := fscache.NewCacheWithHaunter(fs, fscache.NewLRUHaunterStrategy(cache.NewFileHaunter(0, 24, 400*time.Millisecond)))+ c, err := fscache.NewCacheWithHaunter(fs, fscache.NewLRUHaunterStrategy(cache.NewFileHaunter("", 0, 24, 400*time.Millisecond)))if err != nil {t.Error(err.Error())return