From aa6c55dec181b951b32225e23569464964e3e91e Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Thu, 17 Jun 2021 08:57:24 +0200 Subject: [PATCH] lib/model: Remove bogus failureevent when restarting folder (#7773) --- lib/model/indexhandler.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/model/indexhandler.go b/lib/model/indexhandler.go index eac421aeb..cfe3fb64b 100644 --- a/lib/model/indexhandler.go +++ b/lib/model/indexhandler.go @@ -174,11 +174,10 @@ func (s *indexHandler) Serve(ctx context.Context) (err error) { return err } +// resume might be called because the folder was actually resumed, or just +// because the folder config changed (and thus the runner and potentially fset). func (s *indexHandler) resume(fset *db.FileSet, runner service) { s.cond.L.Lock() - if !s.paused { - s.evLogger.Log(events.Failure, "index handler got resumed while not paused") - } s.paused = false s.fset = fset s.runner = runner @@ -474,7 +473,7 @@ func (r *indexHandlerRegistry) RegisterFolderState(folder config.FolderConfigura if folder.Paused { r.folderPausedLocked(folder.ID) } else { - r.folderStartedLocked(folder, fset, runner) + r.folderRunningLocked(folder, fset, runner) } r.mut.Unlock() } @@ -492,10 +491,10 @@ func (r *indexHandlerRegistry) folderPausedLocked(folder string) { } } -// folderStartedLocked resumes an already running index handler or starts it, if it +// folderRunningLocked resumes an already running index handler or starts it, if it // was added while paused. // It is a noop if the folder isn't known. -func (r *indexHandlerRegistry) folderStartedLocked(folder config.FolderConfiguration, fset *db.FileSet, runner service) { +func (r *indexHandlerRegistry) folderRunningLocked(folder config.FolderConfiguration, fset *db.FileSet, runner service) { r.folderStates[folder.ID] = &indexHandlerFolderState{ cfg: folder, fset: fset,