From 2843342d00403616f6b042c2d9837ab79aad01be Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Wed, 20 Sep 2023 21:11:51 +0200 Subject: [PATCH] Logs: Reduce severity from error to warning when indexer is busy Signed-off-by: Michael Mayer --- internal/photoprism/import.go | 2 +- internal/photoprism/index.go | 2 +- internal/photoprism/moments.go | 2 +- internal/photoprism/places.go | 2 +- internal/photoprism/purge.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/photoprism/import.go b/internal/photoprism/import.go index 643ca66d3..390a31df7 100644 --- a/internal/photoprism/import.go +++ b/internal/photoprism/import.go @@ -77,7 +77,7 @@ func (imp *Import) Start(opt ImportOptions) fs.Done { // Make sure to run import only once, unless otherwise requested. if !opt.NonBlocking { if err := mutex.MainWorker.Start(); err != nil { - event.Error(fmt.Sprintf("import: %s", err.Error())) + event.Warn(fmt.Sprintf("import: %s", err.Error())) return done } diff --git a/internal/photoprism/index.go b/internal/photoprism/index.go index e156f386b..565f4c049 100644 --- a/internal/photoprism/index.go +++ b/internal/photoprism/index.go @@ -101,7 +101,7 @@ func (ind *Index) Start(o IndexOptions) (found fs.Done, updated int) { } if err := mutex.MainWorker.Start(); err != nil { - event.Error(fmt.Sprintf("index: %s", err.Error())) + event.Warn(fmt.Sprintf("index: %s", err.Error())) return found, updated } diff --git a/internal/photoprism/moments.go b/internal/photoprism/moments.go index 1420fd75f..912baba96 100644 --- a/internal/photoprism/moments.go +++ b/internal/photoprism/moments.go @@ -53,7 +53,7 @@ func (w *Moments) Start() (err error) { } }() - if err := mutex.MainWorker.Start(); err != nil { + if err = mutex.MainWorker.Start(); err != nil { return err } diff --git a/internal/photoprism/places.go b/internal/photoprism/places.go index 1e612d018..e55bbe97f 100644 --- a/internal/photoprism/places.go +++ b/internal/photoprism/places.go @@ -37,7 +37,7 @@ func (w *Places) Start() (updated []string, err error) { }() // Check if a worker is already running. - if err := mutex.MainWorker.Start(); err != nil { + if err = mutex.MainWorker.Start(); err != nil { log.Warnf("index: %s (update locations)", err.Error()) return []string{}, err } diff --git a/internal/photoprism/purge.go b/internal/photoprism/purge.go index ff66e31c1..4b68874bf 100644 --- a/internal/photoprism/purge.go +++ b/internal/photoprism/purge.go @@ -59,7 +59,7 @@ func (w *Purge) Start(opt PurgeOptions) (purgedFiles map[string]bool, purgedPhot purgedFiles = make(map[string]bool) purgedPhotos = make(map[string]bool) - if err := mutex.MainWorker.Start(); err != nil { + if err = mutex.MainWorker.Start(); err != nil { log.Warnf("purge: %s (start)", err.Error()) return purgedFiles, purgedPhotos, 0, err }