🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Don't wake CacheWarmer every 10 seconds, let it sleep :)
Deluan7fc964aec5d4
diff --git a/core/artwork/cache_warmer.go b/core/artwork/cache_warmer.goindex 0cef277d5..754a6e0be 100644--- a/core/artwork/cache_warmer.go+++ b/core/artwork/cache_warmer.go@@ -65,11 +65,10 @@ func (a *cacheWarmer) sendWakeSignal() {func (a *cacheWarmer) run(ctx context.Context) {for {- t := time.AfterFunc(10*time.Second, func() {- a.sendWakeSignal()- })- <-a.wakeSignal- t.Stop()+ a.waitSignal(ctx, 10*time.Second)+ if ctx.Err() != nil {+ break+ }// If cache not available, keep waitingif !a.cache.Available(ctx) {@@ -95,6 +94,20 @@ func (a *cacheWarmer) run(ctx context.Context) {}}+func (a *cacheWarmer) waitSignal(ctx context.Context, timeout time.Duration) {+ var to <-chan time.Time+ if !a.cache.Available(ctx) {+ tmr := time.NewTimer(timeout)+ defer tmr.Stop()+ to = tmr.C+ }+ select {+ case <-to:+ case <-a.wakeSignal:+ case <-ctx.Done():+ }+}+func (a *cacheWarmer) processBatch(ctx context.Context, batch []string) {log.Trace(ctx, "PreCaching a new batch of artwork", "batchSize", len(batch))input := pl.FromSlice(ctx, batch)diff --git a/core/scrobbler/buffered_scrobbler.go b/core/scrobbler/buffered_scrobbler.goindex fbe13a8a9..80c7f6079 100644--- a/core/scrobbler/buffered_scrobbler.go+++ b/core/scrobbler/buffered_scrobbler.go@@ -7,12 +7,13 @@ import ("github.com/navidrome/navidrome/log""github.com/navidrome/navidrome/model"+ "github.com/navidrome/navidrome/utils/pl")func newBufferedScrobbler(ds model.DataStore, s Scrobbler, service string) *bufferedScrobbler {b := &bufferedScrobbler{ds: ds, wrapped: s, service: service}b.wakeSignal = make(chan struct{}, 1)- go b.run()+ go b.run(context.TODO())return b}@@ -49,15 +50,14 @@ func (b *bufferedScrobbler) sendWakeSignal() {}}-func (b *bufferedScrobbler) run() {- ctx := context.Background()+func (b *bufferedScrobbler) run(ctx context.Context) {for {if !b.processQueue(ctx) {time.AfterFunc(5*time.Second, func() {b.sendWakeSignal()})}- <-b.wakeSignal+ <-pl.ReadOrDone(ctx, b.wakeSignal)}}