Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Remove bogus failureevent when restarting folder (#7773)

This commit is contained in:
Simon Frei 2021-06-17 08:57:24 +02:00 committed by GitHub
parent 7e0c24ec89
commit aa6c55dec1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/model/indexhandler.go
View File

@ -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,