Skip to content

🎧 Your Personal Streaming Service

fix(scanner): resolve data race on conf.Server access in getScanner

Deluanfd09ca103fd9
diff --git a/scanner/controller.go b/scanner/controller.go
index 635011840..db6444fa9 100644
--- a/scanner/controller.go
+++ b/scanner/controller.go
@@ -29,21 +29,22 @@ var (
func New(rootCtx context.Context, ds model.DataStore, cw artwork.CacheWarmer, broker events.Broker,
pls core.Playlists, m metrics.Metrics) model.Scanner {
c := &controller{
- rootCtx: rootCtx,
- ds: ds,
- cw: cw,
- broker: broker,
- pls: pls,
- metrics: m,
+ rootCtx: rootCtx,
+ ds: ds,
+ cw: cw,
+ broker: broker,
+ pls: pls,
+ metrics: m,
+ devExternalScanner: conf.Server.DevExternalScanner,
}
- if !conf.Server.DevExternalScanner {
+ if !c.devExternalScanner {
c.limiter = P(rate.Sometimes{Interval: conf.Server.DevActivityPanelUpdateRate})
}
return c
}
func (s *controller) getScanner() scanner {
- if conf.Server.DevExternalScanner {
+ if s.devExternalScanner {
return &scannerExternal{}
}
return &scannerImpl{ds: s.ds, cw: s.cw, pls: s.pls}
@@ -92,16 +93,17 @@ type scanner interface {
}
type controller struct {
- rootCtx context.Context
- ds model.DataStore
- cw artwork.CacheWarmer
- broker events.Broker
- metrics metrics.Metrics
- pls core.Playlists
- limiter *rate.Sometimes
- count atomic.Uint32
- folderCount atomic.Uint32
- changesDetected bool
+ rootCtx context.Context
+ ds model.DataStore
+ cw artwork.CacheWarmer
+ broker events.Broker
+ metrics metrics.Metrics
+ pls core.Playlists
+ limiter *rate.Sometimes
+ devExternalScanner bool
+ count atomic.Uint32
+ folderCount atomic.Uint32
+ changesDetected bool
}
// getLastScanTime returns the most recent scan time across all libraries