lib/model: Deduplicate folder loops

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4352
LGTM: AudriusButkevicius, calmh
This commit is contained in:
Simon Frei
2017-09-07 06:17:47 +00:00
committed by Jakob Borg
parent 4d3e0de4ba
commit f7d2c58783
4 changed files with 19 additions and 34 deletions

View File

@@ -41,24 +41,7 @@ func (f *sendOnlyFolder) Serve() {
case <-f.scan.timer.C:
l.Debugln(f, "Scanning subdirectories")
err := f.scanSubdirs(nil)
select {
case <-f.initialScanFinished:
default:
status := "Completed"
if err != nil {
status = "Failed"
}
l.Infoln(status, "initial scan (ro) of", f.Description())
close(f.initialScanFinished)
}
if f.scan.HasNoInterval() {
continue
}
f.scan.Reschedule()
f.scanTimerFired()
case req := <-f.scan.now:
req.err <- f.scanSubdirs(req.subdirs)