From 0aaa261a7190837ed063061d89b6816cbda49bc6 Mon Sep 17 00:00:00 2001 From: Deluan Date: Wed, 2 Dec 2020 08:52:35 -0500 Subject: [PATCH] Don't show warning about image cache disabled if pre-cache warmer is disabled --- core/cache_warmer.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/cache_warmer.go b/core/cache_warmer.go index 1563d2cd4..7e824a97f 100644 --- a/core/cache_warmer.go +++ b/core/cache_warmer.go @@ -57,9 +57,9 @@ func (w *warmer) waitForCacheReady(ctx context.Context) { } func (w *warmer) Flush(ctx context.Context) { - w.waitForCacheReady(ctx) - if w.artworkCache.Available(ctx) { - if conf.Server.DevPreCacheAlbumArtwork { + if conf.Server.DevPreCacheAlbumArtwork { + w.waitForCacheReady(ctx) + if w.artworkCache.Available(ctx) { if w.pool == nil || len(w.albums) == 0 { return } @@ -67,9 +67,9 @@ func (w *warmer) Flush(ctx context.Context) { for id := range w.albums { w.pool.Submit(artworkItem{albumID: id}) } + } else { + log.Warn(ctx, "Cache warmer is not available as ImageCache is DISABLED") } - } else { - log.Warn(ctx, "Pre-cache warmer is not available as ImageCache is DISABLED") } w.albums = map[string]struct{}{} }