octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 03:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Don't check folder health if there is nothing to pull (fixes #2497) (#5255)

Browse Source
This commit is contained in:
Simon Frei 2018-10-11 11:33:21 +02:00 committed by Jakob Borg
parent 9d7a811e72
commit 1b10607def
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/model/folder_sendrecv.go
View File

@ -141,11 +141,6 @@ func (f *sendReceiveFolder) pull() bool {
return true return true
} }
if err := f.CheckHealth(); err != nil {
l.Debugln("Skipping pull of", f.Description(), "due to folder error:", err)
return true
}
f.model.fmut.RLock() f.model.fmut.RLock()
curIgnores := f.model.folderIgnores[f.folderID] curIgnores := f.model.folderIgnores[f.folderID]
folderFiles := f.model.folderFiles[f.folderID] folderFiles := f.model.folderFiles[f.folderID]
@ -161,6 +156,11 @@ func (f *sendReceiveFolder) pull() bool {
return true return true
} }
if err := f.CheckHealth(); err != nil {
l.Debugln("Skipping pull of", f.Description(), "due to folder error:", err)
return true
}
curIgnoreHash := curIgnores.Hash() curIgnoreHash := curIgnores.Hash()
ignoresChanged := curIgnoreHash != f.prevIgnoreHash ignoresChanged := curIgnoreHash != f.prevIgnoreHash